Merge ~cjwatson/launchpad:services-database-print-function into launchpad:master

[Colin Watson]

Port lp.services.database to print_function

[Colin Watson (cjwatson)]

Self-approving, since this is trivial and mechanical.

review: Approve

diff --git a/lib/lp/services/database/debug.py b/lib/lp/services/database/debug.py
index a061290..fef9033 100644
--- a/lib/lp/services/database/debug.py
+++ b/lib/lp/services/database/debug.py
@@ -5,6 +5,8 @@
 Replace the psycopg connect method with one that returns a wrapped connection.
 '''
 
+from __future__ import absolute_import, print_function
+
 import logging
 import textwrap
 import traceback
@@ -19,15 +21,15 @@ def LN(*args, **kwargs):
     A variable number of positional arguments are allowed. If
         LN(obj0, obj1, obj2)
     is called, the text part of the output looks like the output from
-        print obj0, obj1, obj2
+        print(obj0, obj1, obj2)
     The optional keyword "wrap" causes the message to be line-wrapped. The
     argument to "wrap" should be "1" or "True". "name" is another optional
     keyword parameter. This is best explained by an example:
         from linenum import LN
         def fun1():
-            print LN('error', 'is', 'here')
+            print(LN('error', 'is', 'here'))
         def fun2():
-            print LN('error',  'is', 'here', name='mess')
+            print(LN('error',  'is', 'here', name='mess'))
         fun1()
         fun2()
     The output is:
@@ -60,12 +62,12 @@ class ConnectionWrapper(object):
 
     def __getattr__(self, key):
         if key in ('rollback', 'close', 'commit'):
-            print '%s %r.__getattr__(%r)' % (LN(), self, key)
+            print('%s %r.__getattr__(%r)' % (LN(), self, key))
             self.__dict__['_log']('__getattr__(%r)', key)
         return getattr(self._real_con, key)
 
     def __setattr__(self, key, val):
-        print '%s %r.__setattr__(%r, %r)' % (LN(), self, key, val)
+        print('%s %r.__setattr__(%r, %r)' % (LN(), self, key, val))
         self.__dict__['_log']('__setattr__(%r, %r)', key, val)
         return setattr(self._real_con, key, val)
 
@@ -79,7 +81,7 @@ def debug_connect(*args, **kw):
     logging.getLogger('lp.services.database.debug').debug(
             'connect(*%r, **%r) == %r', args, kw, con
             )
-    print '%s connect(*%r, **%r) == %r' % (LN(), args, kw, con)
+    print('%s connect(*%r, **%r) == %r' % (LN(), args, kw, con))
     return con
 
 
diff --git a/lib/lp/services/database/postgresql.py b/lib/lp/services/database/postgresql.py
index 2218f42..e6f8c38 100644
--- a/lib/lp/services/database/postgresql.py
+++ b/lib/lp/services/database/postgresql.py
@@ -6,6 +6,8 @@ PostgreSQL specific helper functions, such as database introspection
 and table manipulation
 """
 
+from __future__ import absolute_import, print_function
+
 __metaclass__ = type
 
 import re
@@ -39,7 +41,7 @@ def listReferences(cur, table, column, indirect=True, _state=None):
     to change keys.
 
     >>> for r in listReferences(cur, 'a', 'aid'):
-    ...     print repr(r)
+    ...     print(repr(r))
     (u'a', u'selfref', u'a', u'aid', u'a', u'a')
     (u'b', u'aid', u'a', u'aid', u'c', u'c')
     (u'c', u'aid', u'b', u'aid', u'a', u'a')
@@ -192,7 +194,7 @@ def listSequences(cur):
     standalone.
 
     >>> for r in listSequences(cur):
-    ...     print repr(r)
+    ...     print(repr(r))
     (u'public', u'a_aid_seq', u'a', u'aid')
     (u'public', u'standalone', None, None)
 
@@ -434,12 +436,12 @@ def allow_sequential_scans(cur, permission):
 
     >>> allow_sequential_scans(cur, True)
     >>> cur.execute("SHOW enable_seqscan")
-    >>> print cur.fetchall()[0][0]
+    >>> print(cur.fetchall()[0][0])
     on
 
     >>> allow_sequential_scans(cur, False)
     >>> cur.execute("SHOW enable_seqscan")
-    >>> print cur.fetchall()[0][0]
+    >>> print(cur.fetchall()[0][0])
     off
     """
     permission_value = 'false'
@@ -490,9 +492,9 @@ def fqn(namespace, name):
 
     Quoting is done for the non trivial cases.
 
-    >>> print fqn('public', 'foo')
+    >>> print(fqn('public', 'foo'))
     public.foo
-    >>> print fqn(' foo ', '$bar')
+    >>> print(fqn(' foo ', '$bar'))
     " foo "."$bar"
     """
     if re.search(r"[^a-z_]", namespace) is not None:
@@ -612,4 +614,4 @@ if __name__ == '__main__':
     cur = con.cursor()
 
     for table, column in listReferences(cur, 'person', 'id'):
-        print '%32s %32s' % (table, column)
+        print('%32s %32s' % (table, column))
diff --git a/lib/lp/services/database/sort_sql.py b/lib/lp/services/database/sort_sql.py
index 7ce77de..e43b727 100644
--- a/lib/lp/services/database/sort_sql.py
+++ b/lib/lp/services/database/sort_sql.py
@@ -7,6 +7,8 @@ This library provides functions for the script sort_sql.py, which resides in
 database/schema/.
 """
 
+from __future__ import absolute_import, print_function
+
 __metaclass__ = type
 
 import re
@@ -21,7 +23,7 @@ class Parser:
     >>> p.feed("INSERT INTO foo (id, x) VALUES (1, 23);\n")
     >>> p.feed("INSERT INTO foo (id, x) VALUES (2, 34);\n")
     >>> for line in p.lines:
-    ...     print repr(line)
+    ...     print(repr(line))
     (None, "UPDATE foo SET bar='baz';")
     (None, '')
     (1, 'INSERT INTO foo (id, x) VALUES (1, 23);')
@@ -177,7 +179,7 @@ def print_lines_sorted(file, lines):
 
         for line in block:
             sort_value, string = line
-            print >>file, string
+            print(string, file=file)
 
     for line in lines:
         sort_value, string = line
diff --git a/lib/lp/services/database/sqlbase.py b/lib/lp/services/database/sqlbase.py
index 26e3e7a..ca35d9f 100644
--- a/lib/lp/services/database/sqlbase.py
+++ b/lib/lp/services/database/sqlbase.py
@@ -1,6 +1,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
+
 __metaclass__ = type
 __all__ = [
     'block_implicit_flushes',
@@ -423,15 +425,15 @@ def quote_identifier(identifier):
     In SQL, identifiers are quoted using " rather than ' which is reserved
     for strings.
 
-    >>> print quoteIdentifier('hello')
+    >>> print(quoteIdentifier('hello'))
     "hello"
-    >>> print quoteIdentifier("'")
+    >>> print(quoteIdentifier("'"))
     "'"
-    >>> print quoteIdentifier('"')
+    >>> print(quoteIdentifier('"'))
     """"
-    >>> print quoteIdentifier("\\")
+    >>> print(quoteIdentifier("\\"))
     "\"
-    >>> print quoteIdentifier('\\"')
+    >>> print(quoteIdentifier('\\"'))
     "\"""
     '''
     return '"%s"' % identifier.replace('"', '""')
@@ -453,28 +455,28 @@ def convert_storm_clause_to_string(storm_clause):
     >>> from lp.bugs.interfaces.bugtask import BugTaskImportance
     >>> from storm.expr import And, Or
 
-    >>> print convert_storm_clause_to_string(BugTask)
+    >>> print(convert_storm_clause_to_string(BugTask))
     BugTask
 
-    >>> print convert_storm_clause_to_string(BugTask.id == 16)
+    >>> print(convert_storm_clause_to_string(BugTask.id == 16))
     BugTask.id = 16
 
-    >>> print convert_storm_clause_to_string(
-    ...     BugTask.importance == BugTaskImportance.UNKNOWN)
+    >>> print(convert_storm_clause_to_string(
+    ...     BugTask.importance == BugTaskImportance.UNKNOWN))
     BugTask.importance = 999
 
-    >>> print convert_storm_clause_to_string(Bug.title == "foo'bar'")
+    >>> print(convert_storm_clause_to_string(Bug.title == "foo'bar'"))
     Bug.title = E'foo''bar'''
 
-    >>> print convert_storm_clause_to_string(
+    >>> print(convert_storm_clause_to_string(
     ...     Or(BugTask.importance == BugTaskImportance.UNKNOWN,
-    ...        BugTask.importance == BugTaskImportance.HIGH))
+    ...        BugTask.importance == BugTaskImportance.HIGH)))
     BugTask.importance = 999 OR BugTask.importance = 40
 
-    >>> print convert_storm_clause_to_string(
+    >>> print(convert_storm_clause_to_string(
     ...    And(Bug.title == 'foo', BugTask.bug == Bug.id,
     ...        Or(BugTask.importance == BugTaskImportance.UNKNOWN,
-    ...           BugTask.importance == BugTaskImportance.HIGH)))
+    ...           BugTask.importance == BugTaskImportance.HIGH))))
     Bug.title = E'foo' AND BugTask.bug = Bug.id AND
     (BugTask.importance = 999 OR BugTask.importance = 40)
     """
diff --git a/lib/lp/services/database/tests/script_isolation.py b/lib/lp/services/database/tests/script_isolation.py
index 887c1b4..6f9843b 100644
--- a/lib/lp/services/database/tests/script_isolation.py
+++ b/lib/lp/services/database/tests/script_isolation.py
@@ -5,6 +5,8 @@
 settings work. Note we need to use a non-default isolation level to
 confirm that the changes are actually being made by the API calls."""
 
+from __future__ import absolute_import, print_function
+
 __metaclass__ = type
 __all__ = []
 
@@ -26,7 +28,7 @@ def check():
     cur = cursor()
     cur.execute("UPDATE Person SET homepage_content='foo' WHERE name='mark'")
     cur.execute("SHOW transaction_isolation")
-    print cur.fetchone()[0]
+    print(cur.fetchone()[0])
 
     transaction.abort()
     transaction.begin()
@@ -34,7 +36,7 @@ def check():
     cur = cursor()
     cur.execute("UPDATE Person SET homepage_content='bar' WHERE name='mark'")
     cur.execute("SHOW transaction_isolation")
-    print cur.fetchone()[0]
+    print(cur.fetchone()[0])
 
 dbconfig.override(dbuser='launchpad_main', isolation_level='read_committed')
 disconnect_stores()