From 3c0dbbfe0a4227ac7671f4d5a9bd061bd3a39761 Mon Sep 17 00:00:00 2001 From: Filip Gralinski Date: Sat, 11 Jan 2020 19:22:44 +0100 Subject: [PATCH] Switch to Python3 --- intro/Task101Test.py | 2 +- intro/Task102Test.py | 2 +- intro/Task103Test.py | 2 +- intro/Task104Test.py | 2 +- intro/Task105Test.py | 2 +- intro/Task106Test.py | 2 +- intro/Task107Test.py | 2 +- intro/Task108Test.py | 2 +- intro/Task109Test.py | 2 +- intro/Task110Test.py | 2 +- regexp/Task301Test.py | 2 +- regexp/Task302Test.py | 2 +- regexp/Task303Test.py | 2 +- regexp/Task304Test.py | 2 +- regexp/Task305Test.py | 2 +- regexp/Task306Test.py | 2 +- regexp/Task307Test.py | 2 +- regexp/Task308Test.py | 2 +- regexp/Task309Test.py | 2 +- regexp/Task310Test.py | 2 +- regexp/Task311Test.py | 2 +- regexp/Task312Test.py | 2 +- regexp/Task313Test.py | 2 +- regexp/Task314Test.py | 2 +- regexp/Task315Test.py | 2 +- regexp/Task316Test.py | 2 +- regexp/Task317Test.py | 2 +- regexp/Task318Test.py | 2 +- regexp/Task319Test.py | 2 +- regexp/Task320Test.py | 2 +- regexp/Task321Test.py | 2 +- regexp/Task322Test.py | 2 +- regexp/Task323Test.py | 2 +- regexp/Task324Test.py | 2 +- regexp/Task325Test.py | 2 +- regexp/Task326Test.py | 2 +- regexp/Task327Test.py | 2 +- regexp/Task328Test.py | 2 +- regexp/Task329Test.py | 2 +- run.sh | 7 +------ 40 files changed, 40 insertions(+), 45 deletions(-) mode change 100644 => 100755 regexp/Task308Test.py mode change 100644 => 100755 regexp/Task309Test.py mode change 100644 => 100755 regexp/Task310Test.py mode change 100644 => 100755 regexp/Task311Test.py mode change 100644 => 100755 regexp/Task312Test.py mode change 100644 => 100755 regexp/Task313Test.py mode change 100644 => 100755 regexp/Task314Test.py mode change 100644 => 100755 regexp/Task316Test.py mode change 100644 => 100755 regexp/Task317Test.py mode change 100644 => 100755 regexp/Task318Test.py mode change 100644 => 100755 regexp/Task319Test.py mode change 100644 => 100755 regexp/Task320Test.py mode change 100644 => 100755 regexp/Task321Test.py mode change 100644 => 100755 regexp/Task322Test.py mode change 100644 => 100755 regexp/Task323Test.py mode change 100644 => 100755 regexp/Task324Test.py mode change 100644 => 100755 regexp/Task325Test.py mode change 100644 => 100755 regexp/Task326Test.py mode change 100644 => 100755 regexp/Task327Test.py mode change 100644 => 100755 regexp/Task328Test.py mode change 100644 => 100755 regexp/Task329Test.py diff --git a/intro/Task101Test.py b/intro/Task101Test.py index 5188444..ed9d079 100755 --- a/intro/Task101Test.py +++ b/intro/Task101Test.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 # -*- coding: utf-8 -*- """ diff --git a/intro/Task102Test.py b/intro/Task102Test.py index d493dce..d067c31 100755 --- a/intro/Task102Test.py +++ b/intro/Task102Test.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 # -*- coding: utf-8 -*- """ diff --git a/intro/Task103Test.py b/intro/Task103Test.py index faeabb2..3d1e843 100755 --- a/intro/Task103Test.py +++ b/intro/Task103Test.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 # -*- coding: utf-8 -*- """ diff --git a/intro/Task104Test.py b/intro/Task104Test.py index 07e37a7..b658c21 100755 --- a/intro/Task104Test.py +++ b/intro/Task104Test.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 # -*- coding: utf-8 -*- """ diff --git a/intro/Task105Test.py b/intro/Task105Test.py index c7289e3..392ebb0 100755 --- a/intro/Task105Test.py +++ b/intro/Task105Test.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 # -*- coding: utf-8 -*- """ diff --git a/intro/Task106Test.py b/intro/Task106Test.py index 24d5790..72fd7b5 100755 --- a/intro/Task106Test.py +++ b/intro/Task106Test.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 # -*- coding: utf-8 -*- """ diff --git a/intro/Task107Test.py b/intro/Task107Test.py index c340109..8fa4079 100755 --- a/intro/Task107Test.py +++ b/intro/Task107Test.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 # -*- coding: utf-8 -*- """ diff --git a/intro/Task108Test.py b/intro/Task108Test.py index 7349629..5be2ca8 100755 --- a/intro/Task108Test.py +++ b/intro/Task108Test.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 # -*- coding: utf-8 -*- """ diff --git a/intro/Task109Test.py b/intro/Task109Test.py index 2481628..def9147 100755 --- a/intro/Task109Test.py +++ b/intro/Task109Test.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 # -*- coding: utf-8 -*- """ diff --git a/intro/Task110Test.py b/intro/Task110Test.py index 9f6d34d..8604e7e 100755 --- a/intro/Task110Test.py +++ b/intro/Task110Test.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 # -*- coding: utf-8 -*- """ diff --git a/regexp/Task301Test.py b/regexp/Task301Test.py index b2bbee9..5b9c46f 100755 --- a/regexp/Task301Test.py +++ b/regexp/Task301Test.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 # -*- coding: utf-8 -*- """ diff --git a/regexp/Task302Test.py b/regexp/Task302Test.py index 1f60036..38958f6 100755 --- a/regexp/Task302Test.py +++ b/regexp/Task302Test.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 # -*- coding: utf-8 -*- """ diff --git a/regexp/Task303Test.py b/regexp/Task303Test.py index 26d9d6e..9f8c03b 100755 --- a/regexp/Task303Test.py +++ b/regexp/Task303Test.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 # -*- coding: utf-8 -*- """ diff --git a/regexp/Task304Test.py b/regexp/Task304Test.py index dadd337..42dcf99 100755 --- a/regexp/Task304Test.py +++ b/regexp/Task304Test.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 # -*- coding: utf-8 -*- """ diff --git a/regexp/Task305Test.py b/regexp/Task305Test.py index 401916d..5fde404 100755 --- a/regexp/Task305Test.py +++ b/regexp/Task305Test.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 # -*- coding: utf-8 -*- """ diff --git a/regexp/Task306Test.py b/regexp/Task306Test.py index 8d602b2..0a7b160 100755 --- a/regexp/Task306Test.py +++ b/regexp/Task306Test.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 # -*- coding: utf-8 -*- """ diff --git a/regexp/Task307Test.py b/regexp/Task307Test.py index a92c3e8..a1df76d 100755 --- a/regexp/Task307Test.py +++ b/regexp/Task307Test.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 # -*- coding: utf-8 -*- """ diff --git a/regexp/Task308Test.py b/regexp/Task308Test.py old mode 100644 new mode 100755 index 8ec3fc4..9d0b43e --- a/regexp/Task308Test.py +++ b/regexp/Task308Test.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 # -*- coding: utf-8 -*- """ diff --git a/regexp/Task309Test.py b/regexp/Task309Test.py old mode 100644 new mode 100755 index 17eceb3..3f5a6b1 --- a/regexp/Task309Test.py +++ b/regexp/Task309Test.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 # -*- coding: utf-8 -*- """ diff --git a/regexp/Task310Test.py b/regexp/Task310Test.py old mode 100644 new mode 100755 index 3612909..1d220fb --- a/regexp/Task310Test.py +++ b/regexp/Task310Test.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 # -*- coding: utf-8 -*- """ diff --git a/regexp/Task311Test.py b/regexp/Task311Test.py old mode 100644 new mode 100755 index 3af6fd4..7d0820c --- a/regexp/Task311Test.py +++ b/regexp/Task311Test.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 # -*- coding: utf-8 -*- """ diff --git a/regexp/Task312Test.py b/regexp/Task312Test.py old mode 100644 new mode 100755 index aac7808..3241ce4 --- a/regexp/Task312Test.py +++ b/regexp/Task312Test.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 # -*- coding: utf-8 -*- """ diff --git a/regexp/Task313Test.py b/regexp/Task313Test.py old mode 100644 new mode 100755 index 0f20221..8469dd5 --- a/regexp/Task313Test.py +++ b/regexp/Task313Test.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 # -*- coding: utf-8 -*- """ diff --git a/regexp/Task314Test.py b/regexp/Task314Test.py old mode 100644 new mode 100755 index 9a67ca1..794317c --- a/regexp/Task314Test.py +++ b/regexp/Task314Test.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 # -*- coding: utf-8 -*- """ diff --git a/regexp/Task315Test.py b/regexp/Task315Test.py index 509b5be..351ab89 100755 --- a/regexp/Task315Test.py +++ b/regexp/Task315Test.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 # -*- coding: utf-8 -*- """ diff --git a/regexp/Task316Test.py b/regexp/Task316Test.py old mode 100644 new mode 100755 index f890490..1b7bfc2 --- a/regexp/Task316Test.py +++ b/regexp/Task316Test.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 # -*- coding: utf-8 -*- """ diff --git a/regexp/Task317Test.py b/regexp/Task317Test.py old mode 100644 new mode 100755 index 92f25ba..2ddf52b --- a/regexp/Task317Test.py +++ b/regexp/Task317Test.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 # -*- coding: utf-8 -*- """ diff --git a/regexp/Task318Test.py b/regexp/Task318Test.py old mode 100644 new mode 100755 index f8be698..b97760c --- a/regexp/Task318Test.py +++ b/regexp/Task318Test.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 # -*- coding: utf-8 -*- """ diff --git a/regexp/Task319Test.py b/regexp/Task319Test.py old mode 100644 new mode 100755 index 295a158..8b974aa --- a/regexp/Task319Test.py +++ b/regexp/Task319Test.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 # -*- coding: utf-8 -*- """ diff --git a/regexp/Task320Test.py b/regexp/Task320Test.py old mode 100644 new mode 100755 index 91de065..a684bf8 --- a/regexp/Task320Test.py +++ b/regexp/Task320Test.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 # -*- coding: utf-8 -*- """ diff --git a/regexp/Task321Test.py b/regexp/Task321Test.py old mode 100644 new mode 100755 index 726004c..a0db355 --- a/regexp/Task321Test.py +++ b/regexp/Task321Test.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 # -*- coding: utf-8 -*- """ diff --git a/regexp/Task322Test.py b/regexp/Task322Test.py old mode 100644 new mode 100755 index b820c68..163aee6 --- a/regexp/Task322Test.py +++ b/regexp/Task322Test.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 # -*- coding: utf-8 -*- """ diff --git a/regexp/Task323Test.py b/regexp/Task323Test.py old mode 100644 new mode 100755 index 9a11043..925f617 --- a/regexp/Task323Test.py +++ b/regexp/Task323Test.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 # -*- coding: utf-8 -*- """ diff --git a/regexp/Task324Test.py b/regexp/Task324Test.py old mode 100644 new mode 100755 index fa43c5c..70e0dca --- a/regexp/Task324Test.py +++ b/regexp/Task324Test.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 # -*- coding: utf-8 -*- """ diff --git a/regexp/Task325Test.py b/regexp/Task325Test.py old mode 100644 new mode 100755 index 823ec80..228f219 --- a/regexp/Task325Test.py +++ b/regexp/Task325Test.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 # -*- coding: utf-8 -*- """ diff --git a/regexp/Task326Test.py b/regexp/Task326Test.py old mode 100644 new mode 100755 index 3beed27..b711d57 --- a/regexp/Task326Test.py +++ b/regexp/Task326Test.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 # -*- coding: utf-8 -*- """ diff --git a/regexp/Task327Test.py b/regexp/Task327Test.py old mode 100644 new mode 100755 index 1f4508f..a3a3cdd --- a/regexp/Task327Test.py +++ b/regexp/Task327Test.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 # -*- coding: utf-8 -*- """ diff --git a/regexp/Task328Test.py b/regexp/Task328Test.py old mode 100644 new mode 100755 index e8376ba..eea6001 --- a/regexp/Task328Test.py +++ b/regexp/Task328Test.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 # -*- coding: utf-8 -*- """ diff --git a/regexp/Task329Test.py b/regexp/Task329Test.py old mode 100644 new mode 100755 index 47b8a1a..6e07cb5 --- a/regexp/Task329Test.py +++ b/regexp/Task329Test.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 # -*- coding: utf-8 -*- """ diff --git a/run.sh b/run.sh index f3d86e4..de0a9a0 100755 --- a/run.sh +++ b/run.sh @@ -12,12 +12,7 @@ echo '' > "$LOGFILE" typeset -A POINTS_PER_CLASSES -if [[ -e /usr/bin/pylint2 ]] -then -PYLINT_EXEC=pylint2 -else PYLINT_EXEC=pylint -fi run_pylint() { @@ -62,7 +57,7 @@ process_test() MSS="READ FROM FILE overridden.txt " else XML_FILE=${1/%.py/.xml} - nosetests2 --with-xunit --xunit-file="$XML_FILE" $1 + nosetests3 --with-xunit --xunit-file="$XML_FILE" $1 TESTS_OK=$? run_pylint $1 $2