Merge lp:~cjwatson/ubuntu-test-cases/python3 into lp:~xnox/ubuntu-test-cases/touch-emulator

[Colin Watson]

Support devices with only python3.

Support devices with only python3.

Unmerged revisions

145. By Colin Watson on 2014-05-23

Support devices with only python3.

=== modified file 'utils/target/unlock_screen.py'
--- utils/target/unlock_screen.py	2014-01-10 10:52:20 +0000
+++ utils/target/unlock_screen.py	2014-05-23 15:49:54 +0000
@@ -1,4 +1,6 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
+
+from __future__ import print_function
 
 from autopilot import introspection
 from autopilot.display import Display
@@ -9,46 +11,46 @@
 
 
 def help():
-    print "Usage:"
-    print "Run the script without any argument to unlock with assertion"
-    print ""
-    print "option -q:"
-    print "Execute with parameter -q to unlock the screen quickly without introspection"
+    print("Usage:")
+    print("Run the script without any argument to unlock with assertion")
+    print("")
+    print("option -q:")
+    print("Execute with parameter -q to unlock the screen quickly without introspection")
 
 
 def start_unity_in_testability():
     override_file = "~/.config/upstart/unity8.override"
 
     os.system('echo "exec unity8 -testability" > ~/.config/upstart/unity8.override')
-    os.system('echo "kill timeout 30" >> ~/.config/upstart/unity8.override')    
+    os.system('echo "kill timeout 30" >> ~/.config/upstart/unity8.override')
 
-    print "----------------------------------------------------------------------"
-    print "Stopping Unity"
+    print("----------------------------------------------------------------------")
+    print("Stopping Unity")
     os.system('/sbin/stop unity8')
-    print "Unity stopped"
+    print("Unity stopped")
     os.system('rm -f /tmp/mir_socket')
 
-    print "----------------------------------------------------------------------"
-    print "Taking screen lock (#1235000)"
+    print("----------------------------------------------------------------------")
+    print("Taking screen lock (#1235000)")
     bus = dbus.SystemBus()
     powerd = bus.get_object('com.canonical.powerd', '/com/canonical/powerd')
     powerd_cookie = powerd.requestSysState("autopilot-lock", 1, dbus_interface='com.canonical.powerd')
-    print "----------------------------------------------------------------------"
-    print "Starting Unity with testability"
+    print("----------------------------------------------------------------------")
+    print("Starting Unity with testability")
     os.system('/sbin/start unity8')
-    print "Unity started"
-    print "----------------------------------------------------------------------"
-    print "Releasing screen lock (#1235000)"
+    print("Unity started")
+    print("----------------------------------------------------------------------")
+    print("Releasing screen lock (#1235000)")
     powerd.clearSysState(powerd_cookie, dbus_interface='com.canonical.powerd')
 
-    print "----------------------------------------------------------------------"
+    print("----------------------------------------------------------------------")
     if os.path.exists(override_file):
         os.remove(override_file)
-    print "Cleaned up upstart override"
-    print "----------------------------------------------------------------------"
+    print("Cleaned up upstart override")
+    print("----------------------------------------------------------------------")
 
-    print "Turning on the screen"
-    print ""
+    print("Turning on the screen")
+    print("")
 
 
 def unlock_screen():
@@ -65,8 +67,8 @@
     try:
         greeter.shown.wait_for(False)
     except AssertionError:
-        print "----------------------------------------------------------------------"
-        print "THE SCREEN DIDN'T UNLOCK THE FIRST TRY, NOW ATTEMPTING A BLIND SWIPE"
+        print("----------------------------------------------------------------------")
+        print("THE SCREEN DIDN'T UNLOCK THE FIRST TRY, NOW ATTEMPTING A BLIND SWIPE")
         unlock_screen_blind(greeter)
 
 
@@ -82,11 +84,11 @@
         try:
             greeter.shown.wait_for(False)
             if greeter.shown is False:
-                print ""
-                print "THE SCREEN IS NOW UNLOCKED"
+                print("")
+                print("THE SCREEN IS NOW UNLOCKED")
         except AssertionError:
-            print "----------------------------------------------------------------------"
-            "THE SCREEN DIDN'T UNLOCK, RESTART THE DEVICE AND RUN THE SCRIPT AGAIN"
+            print("----------------------------------------------------------------------")
+            print("THE SCREEN DIDN'T UNLOCK, RESTART THE DEVICE AND RUN THE SCRIPT AGAIN")
 
 
 if len(sys.argv) >= 2 and sys.argv[1] == '-q':

=== modified file 'utils/target/unlock_screen.sh'
--- utils/target/unlock_screen.sh	2014-01-04 03:16:56 +0000
+++ utils/target/unlock_screen.sh	2014-05-23 15:49:54 +0000
@@ -2,7 +2,13 @@
 
 basedir=$(dirname $(readlink -f $0))
 
-sudo -i -u phablet bash -ic "PYTHONPATH=$(pwd) ${basedir}/unlock_screen.py -q"
+if which python3 >/dev/null 2>&1; then
+    python=python3
+else
+    python=python
+fi
+
+sudo -i -u phablet bash -ic "PYTHONPATH=$(pwd) ${python} ${basedir}/unlock_screen.py -q"
 rc=$?
 
 exit $rc