Merge lp:~brian.curtin/ubuntuone-dev-tools/py3-print-function into lp:ubuntuone-dev-tools

[Brian Curtin]

- Change to Python 3's print function usage via "from __future__ import print_function"

Change usage of the print statement to Python 3's print function via "from __future__ import print_function"

[Alejandro J. Cura (alecu)]

ubuntuone/devtools/handlers.py:
    59: [E0001] invalid syntax

review: Needs Fixing

[lp:~brian.curtin/ubuntuone-dev-tools/py3-print-function]

82. By Brian Curtin on 2012-08-20

Left out one of the print function changes

[Alejandro J. Cura (alecu)]

+1

review: Approve

[Roberto Alsina (ralsina)]

review: Approve

=== modified file 'ubuntuone/devtools/handlers.py'
--- ubuntuone/devtools/handlers.py	2012-04-04 19:13:46 +0000
+++ ubuntuone/devtools/handlers.py	2012-08-20 22:17:30 +0000
@@ -31,6 +31,8 @@
 # files in the program, then also delete it here.
 """Set of helpers handlers."""
 
+from __future__ import print_function
+
 import logging
 
 
@@ -51,15 +53,15 @@
     def dump_contents(self, msgs):
         """Dumps the contents of the MementoHandler."""
         if self.debug:
-            print "Expecting:"
+            print("Expecting:")
             for msg in msgs:
-                print "\t", msg
-            print "MementoHandler contents:"
+                print("\t", msg)
+            print("MementoHandler contents:")
             for rec in self.records:
-                print "\t", rec.exc_info
-                print "\t", logging.getLevelName(rec.levelno)
-                print "\t\t", rec.message
-                print "\t\t", rec.exc_text
+                print("\t", rec.exc_info)
+                print("\t", logging.getLevelName(rec.levelno))
+                print("\t\t", rec.message)
+                print("\t\t", rec.exc_text)
 
     def check(self, level, *msgs):
         """Verifies that the msgs are logged in the specified level"""

=== modified file 'ubuntuone/devtools/services/squid.py'
--- ubuntuone/devtools/services/squid.py	2012-06-05 20:52:54 +0000
+++ ubuntuone/devtools/services/squid.py	2012-08-20 22:17:30 +0000
@@ -27,6 +27,8 @@
 # files in the program, then also delete it here.
 """Utilities for finding and running a squid proxy for testing."""
 
+from __future__ import print_function
+
 import random
 import signal
 # pylint:disable=W0402
@@ -263,7 +265,7 @@
     def _is_squid_running(self):
         """Return if squid is running."""
         squid_args = ['-k', 'check', '-f', self.config_file]
-        print 'Starting squid version...'
+        print('Starting squid version...')
         message = 'Waiting for squid to start...'
         for timeout in (0.4, 0.1, 0.1, 0.2, 0.5, 1, 3, 5):
             try:
@@ -274,7 +276,7 @@
                 return True
             except subprocess.CalledProcessError:
                 message += '.'
-                print message
+                print(message)
                 time.sleep(timeout)
         return False