Use print function

sebastinas · sebastinas · commit 301a3540b550 · 2015-02-04T17:21:18.000+01:00
Signed-off-by: Sebastian Ramacher &lt;sebastian+dev@ramacher.at&gt;
diff --git a/bpdb/__init__.py b/bpdb/__init__.py
@@ -21,6 +21,8 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
+from __future__ import print_function
+
 import os
 import sys
 import traceback
@@ -65,16 +67,16 @@ def main():
                       help='Print version and exit.')
     options, args = parser.parse_args(sys.argv)
     if options.version:
-        print 'bpdb on top of bpython version', __version__,
-        print 'on top of Python', sys.version.split()[0]
-        print ('(C) 2008-2013 Bob Farrell, Andreas Stuehrk et al. '
-               'See AUTHORS for detail.')
+        print('bpdb on top of bpython version', __version__, end="")
+        print('on top of Python', sys.version.split()[0])
+        print('(C) 2008-2013 Bob Farrell, Andreas Stuehrk et al. '
+              'See AUTHORS for detail.')
         return 0
 
     # The following code is baed on Python's pdb.py.
     mainpyfile = args[1]
     if not os.path.exists(mainpyfile):
-        print 'Error:', mainpyfile, 'does not exist'
+        print('Error:', mainpyfile, 'does not exist')
         return 1
 
     # Hide bpdb from argument list.
@@ -89,20 +91,20 @@ def main():
             pdb._runscript(mainpyfile)
             if pdb._user_requested_quit:
                 break
-            print "The program finished and will be restarted"
+            print("The program finished and will be restarted")
         except Restart:
-            print "Restarting", mainpyfile, "with arguments:"
-            print "\t" + " ".join(sys.argv[1:])
+            print("Restarting", mainpyfile, "with arguments:")
+            print("\t" + " ".join(sys.argv[1:]))
         except SystemExit:
             # In most cases SystemExit does not warrant a post-mortem session.
-            print "The program exited via sys.exit(). Exit status: ",
-            print sys.exc_info()[1]
+            print("The program exited via sys.exit(). Exit status: ",)
+            print(sys.exc_info()[1])
         except:
             traceback.print_exc()
-            print "Uncaught exception. Entering post mortem debugging"
-            print "Running 'cont' or 'step' will restart the program"
+            print("Uncaught exception. Entering post mortem debugging")
+            print("Running 'cont' or 'step' will restart the program")
             t = sys.exc_info()[2]
             pdb.interaction(None, t)
-            print "Post mortem debugger finished. The " + mainpyfile + \
-                  " will be restarted"
+            print("Post mortem debugger finished. The " + mainpyfile + \
+                  " will be restarted")
 
diff --git a/bpdb/debugger.py b/bpdb/debugger.py
@@ -20,6 +20,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
+from __future__ import print_function
 
 import pdb
 import bpython
@@ -46,10 +47,10 @@ def do_Bpython(self, arg):
 
 
     def help_Bpython(self):
-        print "B(python)"
-        print
-        print ("Invoke the bpython interpreter for this stack frame. To exit "
-               "bpython and return to a standard pdb press Ctrl-d")
+        print("B(python)")
+        print("")
+        print("Invoke the bpython interpreter for this stack frame. To exit "
+              "bpython and return to a standard pdb press Ctrl-d")
 
 
     ### shortcuts
diff --git a/bpython/args.py b/bpython/args.py
@@ -2,7 +2,7 @@
 Module to handle command line argument parsing, for all front-ends.
 """
 
-from __future__ import with_statement
+from __future__ import with_statement, print_function
 import os
 import sys
 import code
@@ -86,10 +86,10 @@ def parse(args, extras=None, ignore_stdin=False):
         os.execv(sys.executable, [sys.executable] + args)
 
     if options.version:
-        print 'bpython version', __version__,
-        print 'on top of Python', sys.version.split()[0]
-        print ('(C) 2008-2014 Bob Farrell, Andreas Stuehrk et al. '
-               'See AUTHORS for detail.')
+        print('bpython version', __version__, eof="")
+        print('on top of Python', sys.version.split()[0])
+        print('(C) 2008-2015 Bob Farrell, Andreas Stuehrk et al. '
+              'See AUTHORS for detail.')
         raise SystemExit
 
     if not ignore_stdin and not (sys.stdin.isatty() and sys.stdout.isatty()):
diff --git a/bpython/urwid.py b/bpython/urwid.py
@@ -33,7 +33,7 @@
 """
 
 
-from __future__ import absolute_import, with_statement, division
+from __future__ import absolute_import, with_statement, division, print_function
 
 import sys
 import os
@@ -144,7 +144,7 @@ def wrapper(*args, **kwargs):
                     # This is the same as in urwid.
                     # We are obviously not supposed to ever hit this.
                     import sys
-                    print sys.exc_info()
+                    print(sys.exc_info())
                     self._exc_info = sys.exc_info()
                     self.reactor.crash()
             return wrapper
@@ -1141,7 +1141,7 @@ def main(args=None, locals_=None, banner=None):
             from twisted.application import reactors
             # Stolen from twisted.application.app (twistd).
             for r in reactors.getReactorTypes():
-                print '    %-4s\t%s' % (r.shortName, r.description)
+                print('    %-4s\t%s' % (r.shortName, r.description))
         except ImportError:
             sys.stderr.write('No reactors are available. Please install '
                 'twisted for reactor support.\n')
