Merge ~cjwatson/launchpad:utilities-print-function into launchpad:master

[Colin Watson]

Port utilities to print_function

[Colin Watson (cjwatson)]

Self-approving (a bit bulky, but essentially mechanical; no functional change on Python 2).

review: Approve

diff --git a/utilities/audit-security-settings.py b/utilities/audit-security-settings.py
index 1095c3e..b41238d 100755
--- a/utilities/audit-security-settings.py
+++ b/utilities/audit-security-settings.py
@@ -9,6 +9,9 @@ Usage hint:
 
 % utilities/audit-security.py
 """
+
+from __future__ import absolute_import, print_function
+
 __metatype__ = type
 
 import _pythonpath
@@ -29,7 +32,7 @@ def main():
     auditor = SettingsAuditor(data)
     settings = auditor.audit()
     file(SECURITY_PATH, 'w').write(settings)
-    print auditor.error_data
+    print(auditor.error_data)
 
 if __name__ == '__main__':
     main()
diff --git a/utilities/community-contributions.py b/utilities/community-contributions.py
index 8101fbe..26fe031 100755
--- a/utilities/community-contributions.py
+++ b/utilities/community-contributions.py
@@ -39,6 +39,8 @@ Options:
 # For understanding the code, you may find it helpful to see
 # bzrlib/log.py and http://bazaar-vcs.org/Integrating_with_Bazaar.
 
+from __future__ import absolute_import, print_function
+
 import getopt
 import re
 import sys
@@ -621,7 +623,7 @@ log.log_formatter_registry.register('external_contributors', LogExCons,
 
 
 def usage():
-    print __doc__
+    print(__doc__)
 
 
 # Use backslashes to suppress newlines because this is wiki syntax,
@@ -700,7 +702,7 @@ def main():
 
         logger = log.Logger(b, {'direction': 'reverse', 'levels': 0})
         if not quiet:
-            print "Calculating (this may take a while)..."
+            print("Calculating (this may take a while)...")
 
         # Set information about the current branch for later formatting.
         lec.branch_info = branch_info
@@ -717,13 +719,13 @@ def main():
 
     if not dry_run:
         if not quiet:
-            print "Updating wiki..."
+            print("Updating wiki...")
         # Not sure how to get editmoin to obey our quiet flag.
         editshortcut(wiki_dest, editfile_func=update_if_modified)
         if not quiet:
-            print "Done updating wiki."
+            print("Done updating wiki.")
     else:
-        print page_contents
+        print(page_contents)
 
 
 if __name__ == '__main__':
diff --git a/utilities/create-lp-wadl-and-apidoc.py b/utilities/create-lp-wadl-and-apidoc.py
index 3f26c72..fcfe9a0 100755
--- a/utilities/create-lp-wadl-and-apidoc.py
+++ b/utilities/create-lp-wadl-and-apidoc.py
@@ -10,6 +10,9 @@ Example:
     % LPCONFIG=development bin/py utilities/create-lp-wadl-and-apidoc.py \\
       "lib/canonical/launchpad/apidoc/wadl-development-%(version)s.xml"
 """
+
+from __future__ import absolute_import, print_function
+
 import _pythonpath
 
 from multiprocessing import Process
@@ -63,12 +66,12 @@ def make_files(directory, version, timestamp, force):
         (json_filename, json_index, generate_json, 'JSON')):
         # If the src doesn't exist or we are forced to regenerate it...
         if (not os.path.exists(src) or force):
-            print "Writing %s for version %s to %s." % (
-                name, version, src)
+            print("Writing %s for version %s to %s." % (
+                name, version, src))
             write(src, gen(version), timestamp)
         else:
-            print "Skipping already present %s file: %s" % (
-                name, src)
+            print("Skipping already present %s file: %s" % (
+                name, src))
         # Make "index" symlinks, removing any preexisting ones.
         if os.path.exists(dest):
             os.remove(dest)
@@ -106,12 +109,12 @@ def make_files(directory, version, timestamp, force):
     # If the HTML file doesn't exist or we're being forced to regenerate
     # it...
     if (not os.path.exists(html_filename) or force):
-        print "Writing apidoc for version %s to %s" % (
-            version, html_filename)
+        print("Writing apidoc for version %s to %s" % (
+            version, html_filename))
         write(html_filename, generate_html(wadl_filename,
             suppress_stderr=False), timestamp)
     else:
-        print "Skipping already present HTML file:", html_filename
+        print("Skipping already present HTML file:", html_filename)
 
     # Symlink the top-level version html in the version directory for
     # completeness.
@@ -131,7 +134,7 @@ def main(directory, force=False):
     template_file = 'apidoc-index.pt'
     template = PageTemplateFile(template_file)
     index_filename = os.path.join(directory, "index.html")
-    print "Writing index:", index_filename
+    print("Writing index:", index_filename)
     f = open(index_filename, 'w')
     f.write(template(config=config))
 
diff --git a/utilities/findimports.py b/utilities/findimports.py
index bd9e112..1ec49c0 100755
--- a/utilities/findimports.py
+++ b/utilities/findimports.py
@@ -36,6 +36,8 @@ this program; if not, write to the Free Software Foundation, Inc., 675 Mass
 Ave, Cambridge, MA 02139, USA.
 """
 
+from __future__ import absolute_import, print_function
+
 import compiler
 from compiler import ast
 from compiler.visitor import ASTVisitor
@@ -194,7 +196,8 @@ class ModuleGraph(object):
             if filename.endswith(ext):
                 break
         else:
-            print >> sys.stderr, "%s: unknown file name extension" % filename
+            print(
+                "%s: unknown file name extension" % filename, file=sys.stderr)
         longest_prefix_len = 0
         filename = os.path.abspath(filename)
         for prefix in self.path:
@@ -221,8 +224,9 @@ class ModuleGraph(object):
                 return candidate
             name = name[:name.rfind('.')]
         if dotted_name not in self._warned_about:
-            print >> sys.stderr, ("%s: could not find %s"
-                                  % (filename, dotted_name))
+            print(
+                "%s: could not find %s" % (filename, dotted_name),
+                file=sys.stderr)
             self._warned_about.add(dotted_name)
         return dotted_name
 
@@ -268,15 +272,15 @@ class ModuleGraph(object):
 
     def printImportedNames(self):
         for module in self.listModules():
-            print "%s:" % module.modname
-            print "  %s" % "\n  ".join(module.imported_names)
+            print("%s:" % module.modname)
+            print("  %s" % "\n  ".join(module.imported_names))
 
     def printImports(self):
         for module in self.listModules():
-            print "%s:" % module.modname
+            print("%s:" % module.modname)
             imports = list(module.imports)
             imports.sort()
-            print "  %s" % "\n  ".join(imports)
+            print("  %s" % "\n  ".join(imports))
 
     def printUnusedImports(self):
         for module in self.listModules():
@@ -289,31 +293,31 @@ class ModuleGraph(object):
                     if '#' in line:
                         continue # assume there's a comment explaining why it
                                  # is not used
-                print "%s:%s: %s not used" % (module.filename, lineno, name)
+                print("%s:%s: %s not used" % (module.filename, lineno, name))
 
     def printDot(self):
-        print "digraph ModuleDependencies {"
-        print "  node[shape=box];"
+        print("digraph ModuleDependencies {")
+        print("  node[shape=box];")
         allNames = set()
         nameDict = {}
         for n, module in enumerate(self.listModules()):
             module._dot_name = "mod%d" % n
             nameDict[module.modname] = module._dot_name
-            print "  %s[label=\"%s\"];" % (module._dot_name, module.modname)
+            print("  %s[label=\"%s\"];" % (module._dot_name, module.modname))
             for name in module.imports:
                 if name not in self.modules:
                     allNames.add(name)
-        print "  node[style=dotted];"
+        print("  node[style=dotted];")
         names = list(allNames)
         names.sort()
         for n, name in enumerate(names):
             nameDict[name] = id = "extmod%d" % n
-            print "  %s[label=\"%s\"];" % (id, name)
+            print("  %s[label=\"%s\"];" % (id, name))
         for module in self.modules.values():
             for other in module.imports:
-                print "  %s -> %s;" % (nameDict[module.modname],
-                                       nameDict[other]);
-        print "}"
+                print("  %s -> %s;" % (nameDict[module.modname],
+                                       nameDict[other]))
+        print("}")
 
 
 def main(argv=sys.argv):
@@ -326,8 +330,8 @@ def main(argv=sys.argv):
                                    ['dot', 'unused', 'all', 'names', 'imports',
                                     'help'])
     except getopt.error as e:
-        print >> sys.stderr, "%s: %s" % (progname, e)
-        print >> sys.stderr, "Try %s --help." % progname
+        print("%s: %s" % (progname, e), file=sys.stderr)
+        print("Try %s --help." % progname, file=sys.stderr)
         return 1
     for k, v in opts:
         if k in ('-d', '--dot'):
@@ -341,7 +345,7 @@ def main(argv=sys.argv):
         elif k in ('-i', '--imports'):
             action = g.printImports
         elif k in ('-h', '--help'):
-            print helptext
+            print(helptext)
             return 0
     g.trackUnusedNames = (action == g.printUnusedImports)
     if not args:
diff --git a/utilities/format-imports b/utilities/format-imports
index 49cf195..78ecd51 100755
--- a/utilities/format-imports
+++ b/utilities/format-imports
@@ -125,6 +125,8 @@ is over the length limit.
 }}}
 """
 
+from __future__ import absolute_import, print_function
+
 __metaclass__ = type
 
 # SKIP this file when reformatting.
@@ -380,7 +382,7 @@ def process_file(fpath):
     """Process the file with the given path."""
     changed = reformat_importsection(fpath)
     if changed:
-        print fpath
+        print(fpath)
 
 
 def process_tree(dpath):
diff --git a/utilities/get-branch-info b/utilities/get-branch-info
index 5143087..34a6b83 100755
--- a/utilities/get-branch-info
+++ b/utilities/get-branch-info
@@ -8,6 +8,8 @@
 Usage: get-branch-info <branch_url>
 """
 
+from __future__ import absolute_import, print_function
+
 import _pythonpath
 
 import sys
@@ -29,21 +31,21 @@ def main(args):
     branch_lookup = getUtility(IBranchLookup)
     branch = branch_lookup.getByUrl(branch_url)
     if branch is None:
-        print "Could not find branch at %r" % (branch_url,)
+        print("Could not find branch at %r" % (branch_url,))
         return
-    print branch.bzr_identity
-    print
-    print 'Unique name:', branch.unique_name
-    print 'ID:', branch.id
-    print 'Private:', branch.private
-    print 'Type:', branch.branch_type
-    print 'URL:', canonical_url(branch)
+    print(branch.bzr_identity)
+    print()
+    print('Unique name:', branch.unique_name)
+    print('ID:', branch.id)
+    print('Private:', branch.private)
+    print('Type:', branch.branch_type)
+    print('URL:', canonical_url(branch))
     if branch.url is not None:
-        print 'External URL:', branch.url
+        print('External URL:', branch.url)
     branch_path = branch_id_to_path(branch.id)
     mirrored_path = join(
         config.codehosting.mirrored_branches_root, branch_path)
-    print 'Mirrored copy:', mirrored_path
+    print('Mirrored copy:', mirrored_path)
 
 
 if __name__ == '__main__':
diff --git a/utilities/list-pages b/utilities/list-pages
index 7de2538..c4eaf89 100755
--- a/utilities/list-pages
+++ b/utilities/list-pages
@@ -42,6 +42,8 @@ because our cheat objects don't match the app-encoded business logic.
 # - bang the adapter nut against the hardest rock we can find until it cracks
 # - print the nourishing nutty goodness to stdout
 
+from __future__ import absolute_import, print_function
+
 import _pythonpath
 
 from inspect import getmro
@@ -244,7 +246,7 @@ def main():
     gsm = getGlobalSiteManager()
     gsm.registerAdapter(DefaultCanonicalUrlData)
     for a in iter_page_adapters():
-        print format_page_adapter(a)
+        print(format_page_adapter(a))
 
 
 if __name__ == '__main__':
diff --git a/utilities/lsconf.py b/utilities/lsconf.py
index 9404f29..5137ffc 100755
--- a/utilities/lsconf.py
+++ b/utilities/lsconf.py
@@ -5,6 +5,8 @@
 
 """Create lazr.config schema and confs from ZConfig data."""
 
+from __future__ import absolute_import, print_function
+
 __metatype__ = type
 
 # Scripts may have relative imports.
@@ -70,10 +72,10 @@ class Configuration:
             was defined.
         :param section_name: Only print the named section.
         """
-        print '# This configuration derives from:'
+        print('# This configuration derives from:')
         for config_data in self.config.overlays:
-            print '#     %s' % config_data.filename
-        print
+            print('#     %s' % config_data.filename)
+        print()
         name_key = attrgetter('name')
         for count, section in enumerate(sorted(self.config, key=name_key)):
             if section_name is not None and section_name != section.name:
@@ -81,17 +83,17 @@ class Configuration:
             if count > 0:
                 # Separate sections by a blank line, or two when verbose.
                 print
-            print '[%s]' % section.name
+            print('[%s]' % section.name)
             if verbose and section.optional:
-                print '# This section is optional.\n'
+                print('# This section is optional.\n')
             for count, key in enumerate(sorted(section)):
                 if verbose:
                     if count > 0:
                         # Separate keys by a blank line.
-                        print
+                        print()
                     conf_file_name = self.config_file_for_value(section, key)
-                    print '# Defined in: %s' % conf_file_name
-                print '%s: %s' % (key, section[key])
+                    print('# Defined in: %s' % conf_file_name)
+                print('%s: %s' % (key, section[key]))
 
 
 def get_option_parser():
diff --git a/utilities/make-dummy-hosted-branches b/utilities/make-dummy-hosted-branches
index 41a45b3..3a7cced 100755
--- a/utilities/make-dummy-hosted-branches
+++ b/utilities/make-dummy-hosted-branches
@@ -15,6 +15,8 @@ sample data on the filesystem is consistent with the sample data in the
 database.
 """
 
+from __future__ import absolute_import, print_function
+
 import _pythonpath
 
 import os
@@ -45,7 +47,7 @@ def main(argv):
             make_bazaar_branch_and_tree(branch)
     finally:
         transaction.abort()
-    print "Created %d branches based on sample data." % len(list(branches))
+    print("Created %d branches based on sample data." % len(list(branches)))
 
 
 if __name__ == '__main__':
diff --git a/utilities/make-lp-user b/utilities/make-lp-user
index 0f28da4..fe94a9b 100755
--- a/utilities/make-lp-user
+++ b/utilities/make-lp-user
@@ -29,6 +29,8 @@ Please note that this script is for testing purposes only. Do NOT use it in
 production environments.
 """
 
+from __future__ import absolute_import, print_function
+
 import _pythonpath
 
 from optparse import OptionParser
@@ -65,8 +67,8 @@ def make_person(username, email):
     The email address for the user will be <username>@example.com.
     """
     person = factory.makePerson(name=username, email=email)
-    print "username: %s" % (username,)
-    print "email:    %s" % (email,)
+    print("username: %s" % (username,))
+    print("email:    %s" % (email,))
     return person
 
 
@@ -83,15 +85,15 @@ def add_person_to_teams(person, team_names):
     for team_name in team_names:
         team = person_set.getByName(team_name)
         if team is None:
-            print "ERROR: %s not found." % (team_name,)
+            print("ERROR: %s not found." % (team_name,))
             continue
         if not team.is_team:
-            print "ERROR: %s is not a team." % (team_name,)
+            print("ERROR: %s is not a team." % (team_name,))
             continue
         team.addMember(
             person, person, status=TeamMembershipStatus.APPROVED)
         teams_joined.append(team_name)
-    print "teams:    %s" % ' '.join(teams_joined)
+    print("teams:    %s" % ' '.join(teams_joined))
 
 
 def add_ssh_public_keys(person):
@@ -112,10 +114,10 @@ def add_ssh_public_keys(person):
         except (OSError, IOError):
             continue
         key_set.new(person, public_key)
-        print 'Registered SSH key: %s' % (filename,)
+        print('Registered SSH key: %s' % (filename,))
         break
     else:
-        print 'No SSH key files found in %s' % ssh_dir
+        print('No SSH key files found in %s' % ssh_dir)
 
 
 def parse_fingerprints(gpg_output):
@@ -144,7 +146,7 @@ def run_native_gpg(arguments):
         command_line, env=env, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
     stdout, stderr = pipe.communicate()
     if stderr != '':
-        print stderr
+        print(stderr)
     if pipe.returncode != 0:
         raise Exception('GPG error during "%s"' % ' '.join(command_line))
 
@@ -179,7 +181,7 @@ def attach_gpg_keys(email, person):
 
     fingerprints = parse_fingerprints(output)
     if len(fingerprints) == 0:
-        print "No GPG key fingerprints found!"
+        print("No GPG key fingerprints found!")
     for fingerprint in fingerprints:
         add_gpg_key(person, fingerprint)
 
@@ -197,7 +199,7 @@ def parse_args(arguments):
 
     options, args = parser.parse_args(arguments)
     if len(args) == 0:
-        print __doc__
+        print(__doc__)
         sys.exit(2)
 
     options.username = args[0]
diff --git a/utilities/mock-code-import b/utilities/mock-code-import
index 25e86d0..dd0f2dc 100755
--- a/utilities/mock-code-import
+++ b/utilities/mock-code-import
@@ -20,6 +20,8 @@ Details of the Subversion server are printed to stdout.
 # XXX: JonathanLange 2008-01-03: This is deliberately horrible.
 # You can make it nicer if you want.
 
+from __future__ import absolute_import, print_function
+
 import _pythonpath
 
 import os
@@ -38,7 +40,7 @@ from lp.testing.factory import LaunchpadObjectFactory
 
 
 def shell(*args):
-    print ' '.join(args)
+    print(' '.join(args))
     return Popen(args, stdout=PIPE).communicate()[0]
 
 
@@ -59,12 +61,12 @@ def main():
             'trunk', [('README', 'No real content\n.')])
         job = make_import_job(svn_url)
         transaction.commit()
-        print "CodeImportJob.id:", job.id
-        print "Code Import URL:", canonical_url(job.code_import)
-        print "Subversion Repository:", svn_repo_path
-        print "Subversion branch URL:", job.code_import.svn_branch_url
-        print "Launchpad branch URL:", canonical_url(job.code_import.branch)
-        print
+        print("CodeImportJob.id:", job.id)
+        print("Code Import URL:", canonical_url(job.code_import))
+        print("Subversion Repository:", svn_repo_path)
+        print("Subversion branch URL:", job.code_import.svn_branch_url)
+        print("Launchpad branch URL:", canonical_url(job.code_import.branch))
+        print()
     finally:
         svn_server.tearDown()
 
diff --git a/utilities/paste b/utilities/paste
index e2c630e..e602293 100755
--- a/utilities/paste
+++ b/utilities/paste
@@ -3,6 +3,8 @@
 # Copyright 2009-2012 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
+from __future__ import absolute_import, print_function
+
 import _pythonpath
 
 import base64
@@ -123,7 +125,7 @@ def main():
         # Figure out the authentication.
         lp_cookie = get_lp_auth_cookie(AUTH_FILE)
         if lp_cookie is None:
-            print LP_AUTH_INSTRUCTIONS
+            print(LP_AUTH_INSTRUCTIONS)
             return
         browser.testapp.cookiejar.set_cookie(lp_cookie)
 
@@ -140,12 +142,12 @@ def main():
         if oid_form is not None:
             authenticated = authenticate(browser)
             if not authenticated:
-                print LP_AUTH_INSTRUCTIONS
+                print(LP_AUTH_INSTRUCTIONS)
                 return
     for name, value in form:
         browser.getControl(name=name).value = value
     browser.getControl('Paste!').click()
-    print browser.url
+    print(browser.url)
     if parser.options.browser:
         webbrowser.open(browser.url)
 
diff --git a/utilities/pgcreate.py b/utilities/pgcreate.py
index 876aa64..fb7aa2d 100755
--- a/utilities/pgcreate.py
+++ b/utilities/pgcreate.py
@@ -8,6 +8,8 @@
 Like createdb, except will retry on failure.
 ."""
 
+from __future__ import absolute_import, print_function
+
 __metaclass__ = type
 
 import sys
@@ -18,7 +20,7 @@ import psycopg2
 
 def main():
     if len(sys.argv) != 3:
-        print >> sys.stderr, 'Usage: %s [template] [dbname]' % sys.argv[0]
+        print('Usage: %s [template] [dbname]' % sys.argv[0], file=sys.stderr)
         return 1
 
     template, dbname = sys.argv[1:]
diff --git a/utilities/pgkillactive.py b/utilities/pgkillactive.py
index 7729af1..86a94e9 100755
--- a/utilities/pgkillactive.py
+++ b/utilities/pgkillactive.py
@@ -6,6 +6,8 @@
 """Kill transaction that have hung around for too long.
 """
 
+from __future__ import absolute_import, print_function
+
 __metaclass__ = type
 __all__ = []
 
@@ -66,13 +68,13 @@ def main():
 
     if len(rows) == 0:
         if not options.quiet:
-            print 'No transactions to kill'
+            print('No transactions to kill')
             return 0
 
     for usename, pid, backend_start, transaction_start in rows:
-        print 'Killing %s (%d), %s, %s' % (
+        print('Killing %s (%d), %s, %s' % (
             usename, pid, backend_start, transaction_start,
-            )
+            ))
         if not options.dry_run:
             os.kill(pid, signal.SIGTERM)
     return 0
diff --git a/utilities/pgkillidle.py b/utilities/pgkillidle.py
index ec16e03..1c2f70c 100755
--- a/utilities/pgkillidle.py
+++ b/utilities/pgkillidle.py
@@ -6,6 +6,8 @@
 """Kill <IDLE> in transaction connections that have hung around for too long.
 """
 
+from __future__ import absolute_import, print_function
+
 __metaclass__ = type
 __all__ = []
 
@@ -64,13 +66,13 @@ def main():
 
     if len(rows) == 0:
         if not options.quiet:
-            print 'No IDLE transactions to kill'
+            print('No IDLE transactions to kill')
             return 0
 
     for usename, pid, backend_start, query_start in rows:
-        print 'Killing %s(%d), %s, %s' % (
+        print('Killing %s(%d), %s, %s' % (
             usename, pid, backend_start, query_start,
-            )
+            ))
         if not options.dryrun:
             os.kill(pid, signal.SIGTERM)
     return 0
diff --git a/utilities/pglogwatch.py b/utilities/pglogwatch.py
index 49296d1..eb44669 100755
--- a/utilities/pglogwatch.py
+++ b/utilities/pglogwatch.py
@@ -7,6 +7,8 @@
 Watch live PostgreSQL logs for interesting stuff
 """
 
+from __future__ import absolute_import, print_function
+
 from optparse import OptionParser
 import re
 import subprocess
@@ -34,7 +36,7 @@ def generate_loglines(logfile):
     while cmd.poll() is None:
         yield cmd.stdout.readline()
     if cmd.returncode != 0:
-        print >> sys.stderr, cmd.stderr.read()
+        print(cmd.stderr.read(), file=sys.stderr)
         raise RuntimeError("tail returned %d" % cmd.returncode)
 
 
@@ -158,8 +160,8 @@ class Watcher(object):
             return
 
         if process.duration > options.slow:
-            print '[%5d] %s' % (process.pid, process.statement)
-            print '        Duration: %0.3f' % (process.duration,)
+            print('[%5d] %s' % (process.pid, process.statement))
+            print('        Duration: %0.3f' % (process.duration,))
 
 if __name__ == '__main__':
     options = get_options()
diff --git a/utilities/pgmassacre.py b/utilities/pgmassacre.py
index ba22ce1..460cc31 100755
--- a/utilities/pgmassacre.py
+++ b/utilities/pgmassacre.py
@@ -13,6 +13,8 @@ Cut off access, slaughter connections and burn the database to the ground
 (but do nothing that could put the system into recovery mode).
 """
 
+from __future__ import absolute_import, print_function
+
 import _pythonpath
 
 from optparse import OptionParser
@@ -115,13 +117,14 @@ def massacre(database):
             """ % activity_cols(cur), [database])
         for pid, success in cur.fetchall():
             if not success:
-                print >> sys.stderr, (
-                    "pg_terminate_backend(%s) failed" % pid)
+                print(
+                    "pg_terminate_backend(%s) failed" % pid, file=sys.stderr)
         con.close()
 
         if still_open(database):
-            print >> sys.stderr, (
-                    "Unable to kill all backends! Database not destroyed.")
+            print(
+                "Unable to kill all backends! Database not destroyed.",
+                file=sys.stderr)
             return 9
 
         # Destroy the database.
@@ -146,8 +149,9 @@ def massacre(database):
 
 def rebuild(database, template):
     if still_open(template, 20):
-        print >> sys.stderr, (
-            "Giving up waiting for connections to %s to drop." % template)
+        print(
+            "Giving up waiting for connections to %s to drop." % template,
+            file=sys.stderr)
         report_open_connections(template)
         return 10
 
@@ -178,7 +182,7 @@ def rebuild(database, template):
         now = time.time()
     con.close()
 
-    print >> sys.stderr, "Unable to recreate database: %s" % error_msg
+    print("Unable to recreate database: %s" % error_msg, file=sys.stderr)
     return 11
 
 
@@ -193,8 +197,9 @@ def report_open_connections(database):
         ORDER BY datname, usename
         """ % activity_cols(cur))
     for usename, datname, num_connections in cur.fetchall():
-        print >> sys.stderr, "%d connections by %s to %s" % (
-            num_connections, usename, datname)
+        print(
+            "%d connections by %s to %s" % (num_connections, usename, datname),
+            file=sys.stderr)
     con.close()
 
 
@@ -241,7 +246,7 @@ def main():
     if db_exists:
         rv = massacre(database)
         if rv != 0:
-            print >> sys.stderr, "Fail %d" % rv
+            print("Fail %d" % rv, file=sys.stderr)
             return rv
 
     if options.template is not None:
diff --git a/utilities/pgstats.py b/utilities/pgstats.py
index 4c1691f..248b52c 100755
--- a/utilities/pgstats.py
+++ b/utilities/pgstats.py
@@ -8,6 +8,8 @@ Generate some statistics about a PostgreSQL database suitable for
 emailing via cron
 """
 
+from __future__ import absolute_import, print_function
+
 __metaclass__ = type
 
 import sys
@@ -24,7 +26,7 @@ def percentage(num, total):
 
 
 def print_row(key, value):
-    print '%(key)-20s: %(value)s' % vars()
+    print('%(key)-20s: %(value)s' % vars())
 
 
 def pgstattuple(cur, table):
@@ -56,8 +58,8 @@ def main(dbname):
     con = psycopg2.connect("dbname=%s" % dbname)
     cur = con.cursor()
 
-    print 'Statistics for %s' % dbname
-    print '===============' + '=' * (len(dbname))
+    print('Statistics for %s' % dbname)
+    print('===============' + '=' * (len(dbname)))
 
     # Database level statistics
     cur.execute("""
@@ -146,7 +148,7 @@ def main(dbname):
 
 if __name__ == '__main__':
     if len(sys.argv) != 2:
-        print >> sys.stderr, "Usage: %s [DBNAME]" % sys.argv[0]
+        print("Usage: %s [DBNAME]" % sys.argv[0], file=sys.stderr)
         sys.exit(1)
     dbname = sys.argv[1]
     main(dbname)
diff --git a/utilities/report-database-stats.py b/utilities/report-database-stats.py
index 7580bb1..3b171de 100755
--- a/utilities/report-database-stats.py
+++ b/utilities/report-database-stats.py
@@ -4,6 +4,8 @@
 
 """Generate the database statistics report."""
 
+from __future__ import absolute_import, print_function
+
 __metaclass__ = type
 
 import _pythonpath
@@ -268,25 +270,25 @@ def main():
         parser.error("Only one sample in that time range.")
 
     user_cpu = get_cpu_stats(cur, options)
-    print "== Most Active Users =="
-    print
+    print("== Most Active Users ==")
+    print()
     for cpu, username in sorted(user_cpu, reverse=True)[:options.limit]:
-        print "%40s || %10.2f%% CPU" % (username, float(cpu) / 10)
+        print("%40s || %10.2f%% CPU" % (username, float(cpu) / 10))
 
-    print
-    print "== Most Written Tables =="
-    print
+    print()
+    print("== Most Written Tables ==")
+    print()
     tables_sort = [
         'total_tup_written', 'n_tup_upd', 'n_tup_ins', 'n_tup_del', 'relname']
     most_written_tables = sorted(
         tables, key=attrgetter(*tables_sort), reverse=True)
     for table in most_written_tables[:options.limit]:
-        print "%40s || %10.2f tuples/sec" % (
-            table.relname, table.total_tup_written / per_second)
+        print("%40s || %10.2f tuples/sec" % (
+            table.relname, table.total_tup_written / per_second))
 
-    print
-    print "== Most Read Tables =="
-    print
+    print()
+    print("== Most Read Tables ==")
+    print()
     # These match the pg_user_table_stats view. schemaname is the
     # namespace (normally 'public'), relname is the table (relation)
     # name. total_tup_red is the total number of rows read.
@@ -295,37 +297,37 @@ def main():
     most_read_tables = sorted(
         tables, key=attrgetter(*tables_sort), reverse=True)
     for table in most_read_tables[:options.limit]:
-        print "%40s || %10.2f tuples/sec" % (
-            table.relname, table.total_tup_read / per_second)
+        print("%40s || %10.2f tuples/sec" % (
+            table.relname, table.total_tup_read / per_second))
 
     table_bloat_stats = get_bloat_stats(cur, options, 'r')
 
     if not table_bloat_stats:
-        print
-        print "(There is no bloat information available in this time range.)"
+        print()
+        print("(There is no bloat information available in this time range.)")
 
     else:
-        print
-        print "== Most Bloated Tables =="
-        print
+        print()
+        print("== Most Bloated Tables ==")
+        print()
         for bloated_table in table_bloat_stats[:options.limit]:
-            print "%40s || %2d%% || %s of %s" % (
+            print("%40s || %2d%% || %s of %s" % (
                 bloated_table.name,
                 bloated_table.end_bloat_percent,
                 bloated_table.bloat_size,
-                bloated_table.table_size)
+                bloated_table.table_size))
 
         index_bloat_stats = get_bloat_stats(cur, options, 'i')
 
-        print
-        print "== Most Bloated Indexes =="
-        print
+        print()
+        print("== Most Bloated Indexes ==")
+        print()
         for bloated_index in index_bloat_stats[:options.limit]:
-            print "%65s || %2d%% || %s of %s" % (
+            print("%65s || %2d%% || %s of %s" % (
                 bloated_index.sub_name,
                 bloated_index.end_bloat_percent,
                 bloated_index.bloat_size,
-                bloated_index.table_size)
+                bloated_index.table_size))
 
         # Order bloat delta report by size of bloat increase.
         # We might want to change this to percentage bloat increase.
@@ -335,39 +337,39 @@ def main():
             table_bloat_stats, key=bloating_sort_key, reverse=True)
 
         if table_bloating_stats[0].num_samples <= 1:
-            print
-            print fill(dedent("""\
+            print()
+            print(fill(dedent("""\
                 (There are not enough samples in this time range to display
                 bloat change statistics)
-                """))
+                """)))
         else:
-            print
-            print "== Most Bloating Tables =="
-            print
+            print()
+            print("== Most Bloating Tables ==")
+            print()
 
             for bloated_table in table_bloating_stats[:options.limit]:
                 # Bloat decreases are uninteresting, and would need to be in
                 # a separate table sorted in reverse anyway.
                 if bloated_table.delta_bloat_percent > 0:
-                    print "%40s || +%4.2f%% || +%s" % (
+                    print("%40s || +%4.2f%% || +%s" % (
                         bloated_table.name,
                         bloated_table.delta_bloat_percent,
-                        bloated_table.delta_bloat_size)
+                        bloated_table.delta_bloat_size))
 
             index_bloating_stats = sorted(
                 index_bloat_stats, key=bloating_sort_key, reverse=True)
 
-            print
-            print "== Most Bloating Indexes =="
-            print
+            print()
+            print("== Most Bloating Indexes ==")
+            print()
             for bloated_index in index_bloating_stats[:options.limit]:
                 # Bloat decreases are uninteresting, and would need to be in
                 # a separate table sorted in reverse anyway.
                 if bloated_index.delta_bloat_percent > 0:
-                    print "%65s || +%4.2f%% || +%s" % (
+                    print("%65s || +%4.2f%% || +%s" % (
                         bloated_index.sub_name,
                         bloated_index.delta_bloat_percent,
-                        bloated_index.delta_bloat_size)
+                        bloated_index.delta_bloat_size))
 
 
 if __name__ == '__main__':
diff --git a/utilities/shhh.py b/utilities/shhh.py
index 6b9c1f6..f610f9a 100755
--- a/utilities/shhh.py
+++ b/utilities/shhh.py
@@ -48,7 +48,7 @@ def shhh(cmd):
     >>> shhh_script(cmd)
     ('', '', 1)
 
-    >>> cmd = [python, "-c", "import sys; print 666; sys.exit(42)"]
+    >>> cmd = [python, "-c", "import sys; print(666); sys.exit(42)"]
     >>> shhh(cmd)
     666
     42
@@ -57,7 +57,9 @@ def shhh(cmd):
 
     >>> cmd = [
     ...     python, "-c",
-    ...     "import sys; print 666; print >> sys.stderr, 667; sys.exit(42)",
+    ...     "from __future__ import print_function; "
+    ...     "import sys; "
+    ...     "print(666); print(667, file=sys.stderr); sys.exit(42)",
     ...     ]
     >>> shhh_script(cmd)
     ('666\n', '667\n', 42)
diff --git a/utilities/soyuz-sampledata-setup.py b/utilities/soyuz-sampledata-setup.py
index 8f9b80b..8f84752 100755
--- a/utilities/soyuz-sampledata-setup.py
+++ b/utilities/soyuz-sampledata-setup.py
@@ -17,6 +17,8 @@ This script creates a user "ppa-user" (email [e-mail],
 password test) who is able to create PPAs.
 """
 
+from __future__ import absolute_import, print_function
+
 __metaclass__ = type
 
 import _pythonpath
@@ -342,7 +344,7 @@ def create_ppa_user(username, options, approver, log):
         pipe = subprocess.Popen(command_line, stderr=subprocess.PIPE)
         stdout, stderr = pipe.communicate()
         if stderr != '':
-            print stderr
+            print(stderr)
         if pipe.returncode != 0:
             sys.exit(2)
 
@@ -396,7 +398,7 @@ class SoyuzSampledataSetup(LaunchpadScript):
         transaction.commit()
         self.logger.info("Done.")
 
-        print dedent("""
+        print(dedent("""
             Now start your local Launchpad with "make run_codehosting" and log
             into https://launchpad.test/ as "%(email)s" with "test" as the
             password.
@@ -404,7 +406,7 @@ class SoyuzSampledataSetup(LaunchpadScript):
             % {
                 'email': self.options.email,
                 'user_name': user_name,
-                })
+                }))
 
 
 if __name__ == "__main__":
diff --git a/utilities/update-copyright b/utilities/update-copyright
index c2e0236..5df0212 100755
--- a/utilities/update-copyright
+++ b/utilities/update-copyright
@@ -10,6 +10,8 @@ notice to reflect the current year. Looks for the notice in the first three
 lines of the file and leaves the file unchanged if it finds none.
 """
 
+from __future__ import absolute_import, print_function
+
 from datetime import date
 import os
 import re
@@ -49,11 +51,11 @@ def update_files(filenames):
     """Open the files with the given file names and update them."""
     for filename in filenames:
         if not os.path.isfile(filename):
-            print "Skipped: %s does not exist or is not a regular file." %(
-                filename)
+            print("Skipped: %s does not exist or is not a regular file." %(
+                filename))
             continue
         if not os.access(filename, os.W_OK):
-            print "Skipped: %s is not writeable." % filename
+            print("Skipped: %s is not writeable." % filename)
             continue
         lines = file(filename).readlines()
         changed = update_copyright(lines)
@@ -61,9 +63,9 @@ def update_files(filenames):
             newfile = open(filename, 'w')
             newfile.write(''.join(lines))
             newfile.close()
-            print "Updated: %s" % filename
+            print("Updated: %s" % filename)
         else:
-            print "Unchanged: %s" % filename
+            print("Unchanged: %s" % filename)
 
 def find_changed_files():
     """Use the find-changed-files.sh script."""