Python 3 preparation: convert print to a function.

Tool-assisted patch.  It is possible that some "from __future__ import
print_function" are not in fact needed, if a file only uses print()
with a single string as an argument and so would work fine in Python 2
without that import.

Author: jsm28

detectors/irker.py

@@ -14,6 +14,7 @@
 #   channels = irc://chat.freenode.net/channelname
 #
 
+from __future__ import print_function
 import re
 import json
 import socket
@@ -94,7 +95,7 @@ def notify_irker(db, cl, nodeid, oldvalues):
         # Ignore any errors in sending the irker;
         # if the server is down, that's just bad luck
         # XXX might want to do some logging here
-        print '* Sending message to irker failed', str(e)
+        print('* Sending message to irker failed', str(e))
 
 def init(db):
     db.issue.react('create', notify_irker)

roundup/backends/portalocker.py

@@ -47,6 +47,7 @@
    - Added return result
 """
 
+from __future__ import print_function
 __docformat__ = 'restructuredtext'
 
 import os
@@ -151,7 +152,7 @@ def unlock(file):
     timestamp = strftime("%m/%d/%Y %H:%M:%S\n", localtime(time()))
     log.write( timestamp )
 
-    print "Wrote lines. Hit enter to release lock."
+    print("Wrote lines. Hit enter to release lock.")
     dummy = sys.stdin.readline()
 
     log.close()

roundup/cgi/TAL/talgettext.py

@@ -33,6 +33,7 @@
         found.
 """
 
+from __future__ import print_function
 import sys
 import time
 import getopt
@@ -73,9 +74,9 @@
 
 def usage(code, msg=''):
     # Python 2.1 required
-    print >> sys.stderr, __doc__
+    print(__doc__, file=sys.stderr)
     if msg:
-        print >> sys.stderr, msg
+        print(msg, file=sys.stderr)
     sys.exit(code)
 
 
@@ -163,7 +164,7 @@ def _loadFile(self):
         try:
             lines = open(self._filename).readlines()
         except IOError as msg:
-            print >> sys.stderr, msg
+            print(msg, file=sys.stderr)
             sys.exit(1)
 
         section = None
@@ -205,9 +206,9 @@ def _loadFile(self):
             elif section == STR:
                 msgstr += '%s\n' % l
             else:
-                print >> sys.stderr, 'Syntax error on %s:%d' % (infile, lno), \
-                      'before:'
-                print >> sys.stderr, l
+                print('Syntax error on %s:%d' % (infile, lno),
+                      'before:', file=sys.stderr)
+                print(l, file=sys.stderr)
                 sys.exit(1)
         # Add last entry
         if section == STR:
@@ -253,7 +254,7 @@ def main():
             engine = UpdatePOEngine(filename=arg)
 
     if not args:
-        print 'nothing to do'
+        print('nothing to do')
         return
 
     # We don't care about the rendered output of the .pt file
@@ -276,7 +277,7 @@ def write(self, s):
             POTALInterpreter(program, macros, engine, stream=Devnull(),
                              metal=False)()
         except: # Hee hee, I love bare excepts!
-            print 'There was an error processing', filename
+            print('There was an error processing', filename)
             traceback.print_exc()
 
     # Now output the keys in the engine.  Write them to a file if --output or
@@ -296,8 +297,8 @@ def write(self, s):
     except AttributeError:
         pass
     if '' not in messages:
-        print >> outfile, pot_header % {'time': time.ctime(),
-                                        'version': __version__}
+        print(pot_header % {'time': time.ctime(),
+                            'version': __version__}, file=outfile)
 
     msgids = catalog.keys()
     # XXX: You should not sort by msgid, but by filename and position. (SR)

roundup/cgi/cgitb.py

@@ -4,6 +4,7 @@
 
 """Extended CGI traceback handler by Ka-Ping Yee, <[email protected]>.
 """
+from __future__ import print_function
 __docformat__ = 'restructuredtext'
 
 import sys, os, types, string, keyword, linecache, tokenize, inspect, cgi
@@ -213,7 +214,7 @@ def linereader(file=file, lnum=[lnum]):
     return head + string.join(attribs) + string.join(traceback) + '<p>&nbsp;</p>'
 
 def handler():
-    print breaker()
-    print html()
+    print(breaker())
+    print(html())
 
 # vim: set filetype=python ts=4 sw=4 et si :

roundup/cgi/engine_jinja2.py

@@ -31,6 +31,7 @@
     https://github.com/mitsuhiko/jinja2/issues/174
 """
 
+from __future__ import print_function
 import jinja2
 import gettext
 
@@ -45,8 +46,8 @@ def __init__(self, dir):
         extensions = [
             'jinja2.ext.autoescape',
         ]
-        print "Jinja2 templates: ", dir
-        print "Extensions: ", extensions
+        print("Jinja2 templates: ", dir)
+        print("Extensions: ", extensions)
         self._env = jinja2.Environment(
                         loader=jinja2.FileSystemLoader(dir),
                         extensions=extensions

roundup/date.py

@@ -17,6 +17,7 @@
 
 """Date, time and time interval handling.
 """
+from __future__ import print_function
 __docformat__ = 'restructuredtext'
 
 import calendar
@@ -1204,30 +1205,30 @@ def test_range():
         "2002-11-10; 2002-12-12", "; 20:00 +1d", '2002-10-12')
     rispecs = ('from -1w 2d 4:32 to 4d', '-2w 1d')
     for rspec in rspecs:
-        print '>>> Range("%s")' % rspec
-        print `Range(rspec, Date)`
-        print
+        print('>>> Range("%s")' % rspec)
+        print(`Range(rspec, Date)`)
+        print()
     for rspec in rispecs:
-        print '>>> Range("%s")' % rspec
-        print `Range(rspec, Interval)`
-        print
+        print('>>> Range("%s")' % rspec)
+        print(`Range(rspec, Interval)`)
+        print()
 
 def test():
     intervals = ("  3w  1  d  2:00", " + 2d", "3w")
     for interval in intervals:
-        print '>>> Interval("%s")'%interval
-        print `Interval(interval)`
+        print('>>> Interval("%s")'%interval)
+        print(`Interval(interval)`)
 
     dates = (".", "2000-06-25.19:34:02", ". + 2d", "1997-04-17", "01-25",
         "08-13.22:13", "14:25", '2002-12')
     for date in dates:
-        print '>>> Date("%s")'%date
-        print `Date(date)`
+        print('>>> Date("%s")'%date)
+        print(`Date(date)`)
 
     sums = ((". + 2d", "3w"), (".", "  3w  1  d  2:00"))
     for date, interval in sums:
-        print '>>> Date("%s") + Interval("%s")'%(date, interval)
-        print `Date(date) + Interval(interval)`
+        print('>>> Date("%s") + Interval("%s")'%(date, interval))
+        print(`Date(date) + Interval(interval)`)
 
 if __name__ == '__main__':
     test()

roundup/dehtml.py

@@ -1,4 +1,5 @@
 
+from __future__ import print_function
 class dehtml:
     def __init__(self, converter):
         if converter == "none":
@@ -128,20 +129,20 @@ def html2text(html):
 
     html2text = dehtml("dehtml").html2text
     if html2text:
-        print html2text(html)
+        print(html2text(html))
 
     try:
         # trap error seen if N_TOKENS not defined when run.
         html2text = dehtml("beautifulsoup").html2text
         if html2text:
-            print html2text(html)
+            print(html2text(html))
     except NameError as e:
-        print "captured error %s"%e
+        print("captured error %s"%e)
 
     html2text = dehtml("none").html2text
     if html2text:
-        print "FAIL: Error, dehtml(none) is returning a function"
+        print("FAIL: Error, dehtml(none) is returning a function")
     else:
-        print "PASS: dehtml(none) is returning None"
+        print("PASS: dehtml(none) is returning None")
 
 

roundup/dist/command/build.py

@@ -3,6 +3,7 @@
 # All rights reserved.
 # For license terms see the file COPYING.txt.
 #
+from __future__ import print_function
 from roundup import msgfmt
 from distutils.command.build import build as base
 import os
@@ -26,7 +27,7 @@ def check_manifest():
     try:
         f = open('MANIFEST')
     except:
-        print '\n*** SOURCE WARNING: The MANIFEST file is missing!'
+        print('\n*** SOURCE WARNING: The MANIFEST file is missing!')
         return
     try:
         manifest = [l.strip() for l in f.readlines()]
@@ -38,9 +39,9 @@ def check_manifest():
         'roundup-mailgw', 'roundup-server', 'roundup-xmlrpc-server'])
     if err:
         n = len(manifest)
-        print '\n*** SOURCE WARNING: There are files missing (%d/%d found)!'%(
-            n-len(err), n)
-        print 'Missing:', '\nMissing: '.join(err)
+        print('\n*** SOURCE WARNING: There are files missing (%d/%d found)!'%(
+            n-len(err), n))
+        print('Missing:', '\nMissing: '.join(err))
 
 def build_message_files(command):
     """For each locale/*.po, build .mo file in target locale directory"""

roundup/init.py

@@ -17,6 +17,7 @@
 #
 """Init (create) a roundup instance.
 """
+from __future__ import print_function
 __docformat__ = 'restructuredtext'
 
 import os, errno, email.parser
@@ -132,9 +133,9 @@ def loadTemplateInfo(path):
         return None
 
     if os.path.exists(os.path.join(path, 'config.py')):
-        print _("WARNING: directory '%s'\n"
+        print(_("WARNING: directory '%s'\n"
             "\tcontains old-style template - ignored"
-            ) % os.path.abspath(path)
+            ) % os.path.abspath(path))
         return None
 
     # load up the template's information

roundup/mailgw.py

@@ -92,6 +92,7 @@ class node. Any parts of other types are each stored in separate files
 an exception, the original message is bounced back to the sender with the
 explanatory message given in the exception.
 """
+from __future__ import print_function
 __docformat__ = 'restructuredtext'
 
 import string, re, os, mimetools, cStringIO, smtplib, socket, binascii, quopri
@@ -1379,7 +1380,7 @@ def do_imap(self, server, user='', password='', mailbox='', ssl=0,
                 password = getpass.getpass()
         except (KeyboardInterrupt, EOFError):
             # Ctrl C or D maybe also Ctrl Z under Windows.
-            print "\nAborted by user."
+            print("\nAborted by user.")
             return 1
         # open a connection to the server and retrieve all messages
         try:
@@ -1468,7 +1469,7 @@ def _do_pop(self, server, user, password, apop, ssl):
                 password = getpass.getpass()
         except (KeyboardInterrupt, EOFError):
             # Ctrl C or D maybe also Ctrl Z under Windows.
-            print "\nAborted by user."
+            print("\nAborted by user.")
             return 1
 
         # open a connection to the server and retrieve all messages