Convert test/script.py to py3.6

Hainish · Hainish · commit 87bc092a8267 · 2018-02-16T11:11:19.000-08:00
diff --git a/test/chromium.sh b/test/chromium.sh
@@ -25,7 +25,7 @@ if [ "$1" == "--justrun" ]; then
 
 	PROFILE_DIRECTORY="$(mktemp -d)"
 	trap 'rm -r "$PROFILE_DIRECTORY"' EXIT
-	
+
 	# Chromium package name is 'chromium' in Debian 7 (wheezy) and other distros like Arch
 	BROWSER="chromium-browser"
 	which $BROWSER || BROWSER="chromium"
@@ -37,5 +37,5 @@ else
 	./make.sh
 	echo "running tests"
 	CRX_NAME="`ls -tr pkg/*.crx | tail -1`"
-	$XVFB_RUN python2.7 test/script.py Chrome $CRX_NAME
+	$XVFB_RUN python3.6 test/script.py Chrome $CRX_NAME
 fi
diff --git a/test/firefox.sh b/test/firefox.sh
@@ -58,8 +58,8 @@ else
 
   PATH=/home/user/geckodriver:$PATH
   if [ -n "$FIREFOX" ]; then
-    $XVFB_RUN python2.7 test/script.py Firefox "$PROFILE_DIRECTORY" $FIREFOX
+    $XVFB_RUN python3.6 test/script.py Firefox "$PROFILE_DIRECTORY" $FIREFOX
   else
-    $XVFB_RUN python2.7 test/script.py Firefox "$PROFILE_DIRECTORY"
+    $XVFB_RUN python3.6 test/script.py Firefox "$PROFILE_DIRECTORY"
   fi
 fi
diff --git a/test/script.py b/test/script.py
@@ -49,8 +49,8 @@ class bcolors:
         error = e.__str__()
 
         if "executable needs to be in PATH" in e.__str__():
-            print "ChromeDriver isn't installed. Check test/chromium/README.md " \
-                "for instructions on how to install ChromeDriver"
+            print("ChromeDriver isn't installed. Check test/chromium/README.md " \
+                "for instructions on how to install ChromeDriver")
 
             sys.exit(2)
         else:
@@ -68,8 +68,8 @@ class bcolors:
         error = e.__str__()
 
         if "executable needs to be in PATH" in e.__str__():
-            print "GeckoDriver isn't installed. Check test/firefox/README.md " \
-                "for instructions on how to install GeckoDriver"
+            print("GeckoDriver isn't installed. Check test/firefox/README.md " \
+                "for instructions on how to install GeckoDriver")
 
             sys.exit(2)
         else:
@@ -78,18 +78,18 @@ class bcolors:
     # Allow the extension time to load
     time.sleep(1)
 
-print ''
+print('')
 
 driver.get('http://freerangekitten.com')
 
 test_failed = False
 if driver.current_url.startswith('https'):
-    print bcolors.OKGREEN + sys.argv[1] + ": HTTP to HTTPS redirection successful" + bcolors.ENDC
+    print(bcolors.OKGREEN + sys.argv[1] + ": HTTP to HTTPS redirection successful" + bcolors.ENDC)
 elif driver.current_url.startswith('http'):
-    print bcolors.FAIL + sys.argv[1] + ": HTTP to HTTPS redirection failed" + bcolors.ENDC
+    print(bcolors.FAIL + sys.argv[1] + ": HTTP to HTTPS redirection failed" + bcolors.ENDC)
     test_failed = True
 
-print ''
+print('')
 
 driver.quit()
 
