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

[Colin Watson]

Convert lp.testing to print_function

I also added unicode_literals in a few places where it could be done
with minimal disruption.

The build_test_suite change is because for doctests we can't just do
"from __future__ import print_function" etc. at the top of the file, and
instead have to insert print_function etc. into their globals when
constructing the corresponding test suite; this is a way of spelling
that without having to incur too much verbiage at every site.

[Kristian Glass (doismellburning)]

Looks fab, thanks - generally approve but I'd appreciate context on the build_test_suite change please

[Colin Watson (cjwatson)]

I think the best context for the build_test_suite change is probably to look at the end of https://code.launchpad.net/~cjwatson/launchpad/code-doctests-future-imports/+merge/345470. Briefly, for doctests we can't just do "from __future__ import print_function" etc. at the top of the file; instead, we have to do a much more awkward construction of inserting print_function etc. into their globals when constructing the corresponding test suite. lp.testing.systemdocs.setUp(future=True) is a way of spelling that without having to incur too much verbiage at every site.

[Kristian Glass (doismellburning)]

Great, thank you

What do you think about adding that context to the commit message? I approve the change either way, but I know if I found myself hitting that line in `git blame`, I'd appreciate the additional explanation

review: Approve

[Colin Watson (cjwatson)]

Sure - I've amended the commit message.

[Otto Co-Pilot (otto-copilot)]

Voting criteria not met
https://jenkins.ols.canonical.com/online-services/job/launchpad/15/

[Colin Watson (cjwatson)]

Self-approving to work around incorrect reviewer on this MP (since fixed).

review: Approve

diff --git a/lib/lp/testing/__init__.py b/lib/lp/testing/__init__.py
index 81e0f1f..5f91c86 100644
--- a/lib/lp/testing/__init__.py
+++ b/lib/lp/testing/__init__.py
@@ -1,7 +1,7 @@
 # Copyright 2009-2018 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
-from __future__ import absolute_import
+from __future__ import absolute_import, print_function
 
 
 __metaclass__ = type
@@ -258,21 +258,21 @@ class FakeTime:
     calls of advance() or next_now().
 
     >>> faketime = FakeTime(1000)
-    >>> print faketime.now()
+    >>> print(faketime.now())
     1000
-    >>> print faketime.now()
+    >>> print(faketime.now())
     1000
     >>> faketime.advance(10)
-    >>> print faketime.now()
+    >>> print(faketime.now())
     1010
-    >>> print faketime.next_now()
+    >>> print(faketime.next_now())
     1011
-    >>> print faketime.next_now(100)
+    >>> print(faketime.next_now(100))
     1111
     >>> faketime = FakeTime(1000, 5)
-    >>> print faketime.next_now()
+    >>> print(faketime.next_now())
     1005
-    >>> print faketime.next_now()
+    >>> print(faketime.next_now())
     1010
     """
 
diff --git a/lib/lp/testing/doc/pagetest-helpers.txt b/lib/lp/testing/doc/pagetest-helpers.txt
index e0bb718..21b6e8f 100644
--- a/lib/lp/testing/doc/pagetest-helpers.txt
+++ b/lib/lp/testing/doc/pagetest-helpers.txt
@@ -30,32 +30,32 @@ one should be use for all anonymous browsing tests.
     ...   return dict(browser.mech_browser.addheaders).get('Authorization','')
 
     >>> anon_browser = test.globs['anon_browser']
-    >>> getAuthorizationHeader(anon_browser)
-    ''
+    >>> print(getAuthorizationHeader(anon_browser))
+    <BLANKLINE>
 
 A browser with a logged in user without any privileges is available
 under 'user_browser'. This one should be use all workflows involving
 logged in users, when it shouldn't require any special privileges.
 
     >>> user_browser = test.globs['user_browser']
-    >>> getAuthorizationHeader(user_browser)
-    'Basic [e-mail]:test'
+    >>> print(getAuthorizationHeader(user_browser))
+    Basic [e-mail]:test
 
 A browser with a logged in user with administrative privileges is
 available under 'admin_browser'. This one should be used for testing
 administrative workflows.
 
     >>> admin_browser = test.globs['admin_browser']
-    >>> getAuthorizationHeader(admin_browser)
-    'Basic [e-mail]:test'
+    >>> print(getAuthorizationHeader(admin_browser))
+    Basic [e-mail]:test
 
 Finally, here is a 'browser' instance that simply contain a pre-
 initialized Browser instance. It doesn't have any authentication
 configured. It can be used when you need to configure another user.
 
     >>> browser = test.globs['browser']
-    >>> getAuthorizationHeader(browser)
-    ''
+    >>> print(getAuthorizationHeader(browser))
+    <BLANKLINE>
 
 All these browser instances are configured with handleErrors set to
 False. This means that exception are raised instead of returning the
@@ -111,15 +111,15 @@ This routine will return the tag with the given id:
     ... </html>
     ... '''
 
-    >>> print find_tag_by_id(content, 'para-1')
+    >>> print(find_tag_by_id(content, 'para-1'))
     <p id="para-1">Paragraph 1</p>
 
-    >>> print find_tag_by_id(content, 'para-2')
+    >>> print(find_tag_by_id(content, 'para-2'))
     <p id="para-2">Paragraph <b>2</b></p>
 
 If an unknown ID is used, None is returned:
 
-    >>> print find_tag_by_id(content, 'para-3')
+    >>> print(find_tag_by_id(content, 'para-3'))
     None
 
 If more than one element has the requested id, raise a DuplicateIdError
@@ -140,10 +140,10 @@ A BeautifulSoup PageElement can be passed instead of a string so that
 content can be retrieved without reparsing the entire page.
 
     >>> parsed_content = find_tag_by_id(content, 'root')
-    >>> print parsed_content.name
+    >>> print(parsed_content.name)
     html
 
-    >>> print find_tag_by_id(parsed_content, 'para-1')
+    >>> print(find_tag_by_id(parsed_content, 'para-1'))
     <p id="para-1">Paragraph 1</p>
 
 
@@ -172,18 +172,18 @@ class:
     ... '''
 
     >>> for tag in find_tags_by_class(content, 'message'):
-    ...     print tag
+    ...     print(tag)
     <p class="message">Message</p>
     <p class="error message">Error message</p>
     <p class="warning message">Warning message</p>
 
     >>> for tag in find_tags_by_class(content, 'error'):
-    ...     print tag
+    ...     print(tag)
     <p class="error message">Error message</p>
     <p class="error">Error</p>
 
     >>> for tag in find_tags_by_class(content, 'warning'):
-    ...     print tag
+    ...     print(tag)
     <p class="warning message">Warning message</p>
     <p class="warning">
       Warning (outer)
@@ -218,7 +218,7 @@ matching Tag object, if one exists:
     ... </html>
     ... '''
 
-    >>> print first_tag_by_class(content, 'light')
+    >>> print(first_tag_by_class(content, 'light'))
     <p class="light">Error message</p>
 
 If no tags have the given class, then "None" is returned.
@@ -235,7 +235,7 @@ If no tags have the given class, then "None" is returned.
     ... </html>
     ... '''
 
-    >>> print first_tag_by_class(content, 'light')
+    >>> print(first_tag_by_class(content, 'light'))
     None
 
 
@@ -276,11 +276,11 @@ find a portlet by its title and return it:
     ... </html>
     ... '''
 
-    >>> print find_portlet(content, 'Portlet 1')
+    >>> print(find_portlet(content, 'Portlet 1'))
     <div...
     ...Contents of portlet 1...
 
-    >>> print find_portlet(content, 'Portlet 2')
+    >>> print(find_portlet(content, 'Portlet 2'))
     <div class="portlet">
       <h2>Portlet 2</h2>
       Contents of portlet 2
@@ -290,14 +290,14 @@ When looking for a portlet to match, any two sequences of whitespace are
 considered equivalent. Whitespace at the beginning or end of the title
 is also ignored.
 
-    >>> print find_portlet(
-    ...     content, 'Portlet with  title broken on multiple lines  ')
+    >>> print(find_portlet(
+    ...     content, 'Portlet with  title broken on multiple lines  '))
       <div class="portlet">
         <h2> Portlet with title...
 
 If the portlet doesn't exist, then None is returned:
 
-    >>> print find_portlet(content, 'No such portlet')
+    >>> print(find_portlet(content, 'No such portlet'))
     None
 
 
@@ -309,7 +309,7 @@ the main content of the page.  The find_main_content() method can be
 used to do this:
 
     >>> find_main_content = test.globs['find_main_content']
-    >>> print find_main_content(content)
+    >>> print(find_main_content(content))
     <...
     Main content area
     ...
@@ -323,16 +323,16 @@ to the end user, and we don't want necessarily to check how the text is
 displayed (ie. bold, italics, coloured et al).
 
     >>> extract_text = test.globs['extract_text']
-    >>> print extract_text(
-    ...     '<p>A paragraph with <b>inline</b> <i>style</i>.</p>')
+    >>> print(extract_text(
+    ...     '<p>A paragraph with <b>inline</b> <i>style</i>.</p>'))
     A paragraph with inline style.
 
 The function also takes care of inserting proper white space for block
 level and other elements introducing a visual separation:
 
-    >>> print extract_text( # doctest: -NORMALIZE_WHITESPACE
+    >>> print(extract_text( # doctest: -NORMALIZE_WHITESPACE
     ...     '<p>Para 1</p><p>Para 2<br>Line 2</p><ul><li>Item 1</li>'
-    ...     '<li>Item 2</li></ul><div>Div 1</div><h1>A heading</h1>')
+    ...     '<li>Item 2</li></ul><div>Div 1</div><h1>A heading</h1>'))
     Para 1
     Para 2
     Line 2
@@ -344,9 +344,9 @@ level and other elements introducing a visual separation:
 Of course, the function ignores processing instructions, declaration,
 comments and render CDATA section has plain text.
 
-    >>> print extract_text(
+    >>> print(extract_text(
     ...     '<?php echo("Hello world!")?><!-- A comment -->'
-    ...     '<?A declaration.><![CDATA[Some << characters >>]]>')
+    ...     '<?A declaration.><![CDATA[Some << characters >>]]>'))
     Some << characters >>
 
 The function also does some white space normalization, since formatted
@@ -358,10 +358,10 @@ single space. Runs of newlines is replaced by one newline. (Note also
 that non-breaking space entities are also transformed into regular
 space.)
 
-    >>> print extract_text( # doctest: -NORMALIZE_WHITESPACE
+    >>> print(extract_text( # doctest: -NORMALIZE_WHITESPACE
     ...     '   <p>Some  \t  white space    <br /></p>   '
     ...     '<p>Another&nbsp; &#160;  paragraph.</p><p><p>'
-    ...     '<p>A final one</p>   ')
+    ...     '<p>A final one</p>   '))
     Some white space
     Another paragraph.
     A final one
@@ -369,10 +369,10 @@ space.)
 The function also knows about the sortkey class used in many tables. The
 sortkey is not displayed but is used for the javascript table sorting.
 
-    >>> print extract_text(
+    >>> print(extract_text(
     ...    '<table><tr><td><span class="sortkey">1</span>First</td></tr>'
     ...    '<tr><td><span class="sortkey">2</span>Second</td></tr>'
-    ...    '<tr><td><span class="sortkey">3</span>Third</td></tr></table>')
+    ...    '<tr><td><span class="sortkey">3</span>Third</td></tr></table>'))
     First Second Third
 
 The extract_text method is often used in conjunction with the other
@@ -380,7 +380,7 @@ find_xxx helper methods to identify the text to display.  Because of
 this the function also accepts BeautifulSoup instance as a parameter
 rather than a plain string.
 
-    >>> print extract_text(find_portlet(content, 'Portlet 2'))
+    >>> print(extract_text(find_portlet(content, 'Portlet 2')))
     Portlet 2
     Contents of portlet 2
 
diff --git a/lib/lp/testing/doc/sample-data-assertions.txt b/lib/lp/testing/doc/sample-data-assertions.txt
index 7f9548e..d50015c 100644
--- a/lib/lp/testing/doc/sample-data-assertions.txt
+++ b/lib/lp/testing/doc/sample-data-assertions.txt
@@ -29,5 +29,5 @@ specifically referenced in Launchpad tests.
   This user is supposed to be a member of only one team, the "Simple Team".
 
   >>> one_membership = personset.getByName('one-membership')
-  >>> for t in one_membership.team_memberships: print t.team.displayname
+  >>> for t in one_membership.team_memberships: print(t.team.displayname)
   Simple Team
diff --git a/lib/lp/testing/faketransaction.py b/lib/lp/testing/faketransaction.py
index 8bf2386..1c41916 100644
--- a/lib/lp/testing/faketransaction.py
+++ b/lib/lp/testing/faketransaction.py
@@ -3,6 +3,8 @@
 
 """Fake transaction manager."""
 
+from __future__ import absolute_import, print_function, unicode_literals
+
 __metaclass__ = type
 __all__ = ['FakeTransaction']
 
@@ -23,7 +25,7 @@ class FakeTransaction:
     def _log(self, call):
         """Print calls that are being made, if desired."""
         if self.log_calls:
-            print call
+            print(call)
 
     def begin(self):
         """Pretend to begin a transaction.  Does not log."""
diff --git a/lib/lp/testing/karma.py b/lib/lp/testing/karma.py
index d8b2ea3..c0eaf8a 100644
--- a/lib/lp/testing/karma.py
+++ b/lib/lp/testing/karma.py
@@ -3,6 +3,8 @@
 
 """Helper functions/classes to be used when testing the karma framework."""
 
+from __future__ import absolute_import, print_function, unicode_literals
+
 __metaclass__ = type
 __all__ = [
     'KarmaAssignedEventListener',
@@ -123,4 +125,4 @@ class KarmaAssignedEventListener(KarmaRecorder):
             text += " distribution=%s" % karma.distribution.name
         if self.show_person:
             text += ", person=%s" % karma.person.name
-        print text
+        print(text)
diff --git a/lib/lp/testing/layers.py b/lib/lp/testing/layers.py
index ffac753..647fbb1 100644
--- a/lib/lp/testing/layers.py
+++ b/lib/lp/testing/layers.py
@@ -18,6 +18,8 @@ of one, forcing us to attempt to make some sort of layer tree.
 -- StuartBishop 20060619
 """
 
+from __future__ import absolute_import, print_function
+
 __metaclass__ = type
 __all__ = [
     'AppServerLayer',
@@ -447,9 +449,9 @@ class BaseLayer:
             # tests that leave threads behind from failing. Its use
             # should only ever be temporary.
             if BaseLayer.disable_thread_check:
-                print (
+                print((
                     "ERROR DISABLED: "
-                    "Test left new live threads: %s") % repr(new_threads)
+                    "Test left new live threads: %s") % repr(new_threads))
             else:
                 BaseLayer.flagTestIsolationFailure(
                     "Test left new live threads: %s" % repr(new_threads))
diff --git a/lib/lp/testing/mail_helpers.py b/lib/lp/testing/mail_helpers.py
index e5a27a9..3ac740a 100644
--- a/lib/lp/testing/mail_helpers.py
+++ b/lib/lp/testing/mail_helpers.py
@@ -1,8 +1,10 @@
 # Copyright 2009-2019 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
-"""Helper functions dealing with emails in tests.
-"""
+"""Helper functions dealing with emails in tests."""
+
+from __future__ import absolute_import, print_function
+
 __metaclass__ = type
 
 import email
@@ -102,23 +104,23 @@ def print_emails(include_reply_to=False, group_similar=False,
             distinct_bodies[body] = (message, recipients)
     for body in sorted(distinct_bodies):
         message, recipients = distinct_bodies[body]
-        print 'From:', message['From']
-        print 'To:', ", ".join(sorted(recipients))
+        print('From:', message['From'])
+        print('To:', ", ".join(sorted(recipients)))
         if include_reply_to:
-            print 'Reply-To:', message['Reply-To']
+            print('Reply-To:', message['Reply-To'])
         rationale_header = 'X-Launchpad-Message-Rationale'
         if include_rationale and rationale_header in message:
-            print '%s: %s' % (rationale_header, message[rationale_header])
+            print('%s: %s' % (rationale_header, message[rationale_header]))
         for_header = 'X-Launchpad-Message-For'
         if include_for and for_header in message:
-            print '%s: %s' % (for_header, message[for_header])
+            print('%s: %s' % (for_header, message[for_header]))
         notification_type_header = 'X-Launchpad-Notification-Type'
         if include_notification_type and notification_type_header in message:
-            print '%s: %s' % (
-                notification_type_header, message[notification_type_header])
-        print 'Subject:', message['Subject']
-        print body
-        print "-" * 40
+            print('%s: %s' % (
+                notification_type_header, message[notification_type_header]))
+        print('Subject:', message['Subject'])
+        print(body)
+        print("-" * 40)
 
 
 def print_distinct_emails(include_reply_to=False, include_rationale=True,
diff --git a/lib/lp/testing/menu.py b/lib/lp/testing/menu.py
index 43ed314..f0f3676 100644
--- a/lib/lp/testing/menu.py
+++ b/lib/lp/testing/menu.py
@@ -3,6 +3,8 @@
 
 """Helpers for testing menus."""
 
+from __future__ import absolute_import, print_function
+
 __metaclass__ = type
 __all__ = [
     'summarise_tal_links',
@@ -62,14 +64,14 @@ def summarise_tal_links(links):
         else:
             link = key
         if ILink.providedBy(link):
-            print 'link %s' % link.name
+            print('link %s' % link.name)
             attributes = ('url', 'enabled', 'menu', 'selected', 'linked')
             for attrname in attributes:
                 if not safe_hasattr(link, attrname):
                     continue
-                print '    %s:' % attrname, getattr(link, attrname)
+                print('    %s:' % attrname, getattr(link, attrname))
         else:
-            print 'attribute %s: %s' % (key, link)
+            print('attribute %s: %s' % (key, link))
 
 
 def make_fake_request(url, traversed_objects=None):
diff --git a/lib/lp/testing/pages.py b/lib/lp/testing/pages.py
index b73d004..9e1b0c3 100644
--- a/lib/lp/testing/pages.py
+++ b/lib/lp/testing/pages.py
@@ -3,6 +3,8 @@
 
 """Testing infrastructure for page tests."""
 
+from __future__ import absolute_import, print_function
+
 __metaclass__ = type
 
 from contextlib import contextmanager
@@ -216,7 +218,7 @@ def find_tag_by_id(content, id):
         return elements_with_id[0]
     else:
         raise DuplicateIdError(
-            'Found %d elements with id %r' % (len(elements_with_id), id))
+            "Found %d elements with id '%s'" % (len(elements_with_id), id))
 
 
 def first_tag_by_class(content, class_):
@@ -286,7 +288,7 @@ def get_feedback_messages(content):
 def print_feedback_messages(content, formatter='minimal'):
     """Print out the feedback messages."""
     for message in get_feedback_messages(content):
-        print extract_text(message, formatter=formatter)
+        print(extract_text(message, formatter=formatter))
 
 
 def print_table(content, columns=None, skip_rows=None, sep="\t"):
@@ -307,7 +309,7 @@ def print_table(content, columns=None, skip_rows=None, sep="\t"):
             if columns is None or col_num in columns:
                 row_content.append(extract_text(item))
         if len(row_content) > 0:
-            print sep.join(row_content)
+            print(sep.join(row_content))
 
 
 def get_radio_button_text_for_field(soup, name):
@@ -340,7 +342,7 @@ def print_radio_button_field(content, name):
     """
     main = BeautifulSoup(content)
     for field in get_radio_button_text_for_field(main, name):
-        print field
+        print(field)
 
 
 def strip_label(label):
@@ -474,48 +476,48 @@ def parse_relationship_section(content):
     section = soup.find('ul')
     whitespace_re = re.compile('\s+')
     if section is None:
-        print 'EMPTY SECTION'
+        print('EMPTY SECTION')
         return
     for li in section.findAll('li'):
         if li.a:
             link = li.a
             content = whitespace_re.sub(' ', link.string.strip())
             url = link['href']
-            print 'LINK: "%s" -> %s' % (content, url)
+            print('LINK: "%s" -> %s' % (content, url))
         else:
             content = whitespace_re.sub(' ', li.string.strip())
-            print 'TEXT: "%s"' % content
+            print('TEXT: "%s"' % content)
 
 
 def print_action_links(content):
     """Print action menu urls."""
     actions = find_tag_by_id(content, 'actions')
     if actions is None:
-        print "No actions portlet"
+        print("No actions portlet")
         return
     entries = actions.findAll('li')
     for entry in entries:
         if entry.a:
-            print '%s: %s' % (entry.a.string, entry.a['href'])
+            print('%s: %s' % (entry.a.string, entry.a['href']))
         elif entry.strong:
-            print entry.strong.string
+            print(entry.strong.string)
 
 
 def print_navigation_links(content):
     """Print navigation menu urls."""
     navigation_links = find_tag_by_id(content, 'navigation-tabs')
     if navigation_links is None:
-        print "No navigation links"
+        print("No navigation links")
         return
     title = navigation_links.find('label')
     if title is not None:
-        print '= %s =' % title.string
+        print('= %s =' % title.string)
     entries = navigation_links.findAll(['strong', 'a'])
     for entry in entries:
         try:
-            print '%s: %s' % (entry.span.string, entry['href'])
+            print('%s: %s' % (entry.span.string, entry['href']))
         except KeyError:
-            print entry.span.string
+            print(entry.span.string)
 
 
 def print_portlet_links(content, name, base=None):
@@ -536,15 +538,15 @@ def print_portlet_links(content, name, base=None):
 
     portlet_contents = find_portlet(content, name)
     if portlet_contents is None:
-        print "No portlet found with name:", name
+        print("No portlet found with name:", name)
         return
     portlet_links = portlet_contents.findAll('a')
     if len(portlet_links) == 0:
-        print "No links were found in the portlet."
+        print("No links were found in the portlet.")
         return
     for portlet_link in portlet_links:
-        print '%s: %s' % (portlet_link.string,
-            extract_link_from_tag(portlet_link, base))
+        print('%s: %s' % (portlet_link.string,
+            extract_link_from_tag(portlet_link, base)))
 
 
 def print_submit_buttons(content):
@@ -555,10 +557,10 @@ def print_submit_buttons(content):
     buttons = find_main_content(content).findAll(
         'input', attrs={'class': 'button', 'type': 'submit'})
     if buttons is None:
-        print "No buttons found"
+        print("No buttons found")
     else:
         for button in buttons:
-            print button['value']
+            print(button['value'])
 
 
 def print_comments(page):
@@ -566,31 +568,31 @@ def print_comments(page):
     main_content = find_main_content(page)
     for comment in main_content('div', 'boardCommentBody'):
         for li_tag in comment('li'):
-            print "Attachment: %s" % li_tag.a.renderContents()
-        print comment.div.renderContents()
-        print "-" * 40
+            print("Attachment: %s" % li_tag.a.renderContents())
+        print(comment.div.renderContents())
+        print("-" * 40)
 
 
 def print_batch_header(soup):
     """Print the batch navigator header."""
     navigation = soup.find('td', {'class': 'batch-navigation-index'})
-    print extract_text(navigation).encode('ASCII', 'backslashreplace')
+    print(extract_text(navigation).encode('ASCII', 'backslashreplace'))
 
 
 def print_self_link_of_entries(json_body):
     """Print the self_link attribute of each entry in the given JSON body."""
     links = sorted(entry['self_link'] for entry in json_body['entries'])
     for link in links:
-        print link
+        print(link)
 
 
 def print_ppa_packages(contents):
     packages = find_tags_by_class(contents, 'archive_package_row')
     for pkg in packages:
-        print extract_text(pkg)
+        print(extract_text(pkg))
     empty_section = find_tag_by_id(contents, 'empty-result')
     if empty_section is not None:
-        print extract_text(empty_section)
+        print(extract_text(empty_section))
 
 
 def print_location(contents):
@@ -614,8 +616,8 @@ def print_location(contents):
     else:
         breadcrumbs = ' > '.join(segments)
 
-    print 'Hierarchy:', breadcrumbs
-    print 'Tabs:'
+    print('Hierarchy:', breadcrumbs)
+    print('Tabs:')
     print_location_apps(contents)
     main_heading = doc.h1
     if main_heading:
@@ -623,7 +625,7 @@ def print_location(contents):
             'us-ascii', 'replace')
     else:
         main_heading = '(No main heading)'
-    print "Main heading: %s" % main_heading
+    print("Main heading: %s" % main_heading)
 
 
 def print_location_apps(contents):
@@ -636,9 +638,9 @@ def print_location_apps(contents):
     else:
         location_apps = location_apps.findAll('span')
     if location_apps is None:
-        print "(Application tabs omitted)"
+        print("(Application tabs omitted)")
     elif len(location_apps) == 0:
-        print "(No application tabs)"
+        print("(No application tabs)")
     else:
         for tab in location_apps:
             tab_text = extract_text(tab)
@@ -652,13 +654,13 @@ def print_location_apps(contents):
                 link = tab.a['href']
             else:
                 link = 'not linked'
-            print "* %s - %s" % (tab_text, link)
+            print("* %s - %s" % (tab_text, link))
 
 
 def print_tag_with_id(contents, id):
     """A simple helper to print the extracted text of the tag."""
     tag = find_tag_by_id(contents, id)
-    print extract_text(tag)
+    print(extract_text(tag))
 
 
 def print_errors(contents):
@@ -666,7 +668,7 @@ def print_errors(contents):
     errors = find_tags_by_class(contents, 'error')
     error_texts = [extract_text(error) for error in errors]
     for error in error_texts:
-        print error
+        print(error)
 
 
 def setupBrowser(auth=None):
diff --git a/lib/lp/testing/publication.py b/lib/lp/testing/publication.py
index 929c643..7f8ee3a 100644
--- a/lib/lp/testing/publication.py
+++ b/lib/lp/testing/publication.py
@@ -3,6 +3,8 @@
 
 """Helpers for testing out publication related code."""
 
+from __future__ import absolute_import, print_function
+
 __metaclass__ = type
 __all__ = [
     'get_request_and_publication',
@@ -67,15 +69,15 @@ def print_request_and_publication(host='localhost', port=None,
     request, publication = get_request_and_publication(
         host, port, method, mime_type,
         extra_environment=extra_environment)
-    print type(request).__name__.split('.')[-1]
+    print(type(request).__name__.split('.')[-1])
     publication_classname = type(publication).__name__.split('.')[-1]
     if isinstance(publication, ProtocolErrorPublication):
-        print "%s: status=%d" % (
-            publication_classname, publication.status)
+        print("%s: status=%d" % (
+            publication_classname, publication.status))
         for name, value in publication.headers.items():
-            print "  %s: %s" % (name, value)
+            print("  %s: %s" % (name, value))
     else:
-        print publication_classname
+        print(publication_classname)
 
 
 def test_traverse(url):
diff --git a/lib/lp/testing/systemdocs.py b/lib/lp/testing/systemdocs.py
index d72d7e7..5a34004 100644
--- a/lib/lp/testing/systemdocs.py
+++ b/lib/lp/testing/systemdocs.py
@@ -3,6 +3,8 @@
 
 """Infrastructure for setting up doctests."""
 
+from __future__ import absolute_import, print_function
+
 __metaclass__ = type
 __all__ = [
     'default_optionflags',
@@ -85,8 +87,8 @@ class StdoutHandler(Handler):
     """
     def emit(self, record):
         Handler.emit(self, record)
-        print >> sys.stdout, '%s:%s:%s' % (
-            record.levelname, record.name, self.format(record))
+        print('%s:%s:%s' % (
+            record.levelname, record.name, self.format(record)))
 
 
 def LayeredDocFileSuite(paths, id_extensions=None, **kw):
diff --git a/lib/lp/testing/tests/test_doc.py b/lib/lp/testing/tests/test_doc.py
index 7ce594c..66783e9 100644
--- a/lib/lp/testing/tests/test_doc.py
+++ b/lib/lp/testing/tests/test_doc.py
@@ -8,10 +8,11 @@ Run the doctests and pagetests.
 import os
 
 from lp.services.testing import build_test_suite
+from lp.testing.systemdocs import setUp
 
 
 here = os.path.dirname(os.path.realpath(__file__))
 
 
 def test_suite():
-    return build_test_suite(here)
+    return build_test_suite(here, setUp=lambda test: setUp(test, future=True))
diff --git a/lib/lp/testing/yuixhr.py b/lib/lp/testing/yuixhr.py
index 13a9cd6..8a601e8 100644
--- a/lib/lp/testing/yuixhr.py
+++ b/lib/lp/testing/yuixhr.py
@@ -3,6 +3,8 @@
 
 """Fixture code for YUITest + XHR integration testing."""
 
+from __future__ import absolute_import, print_function
+
 __metaclass__ = type
 __all__ = [
     'login_as_person',
@@ -146,7 +148,7 @@ class CloseDbResult:
             yield ''
             LibrarianLayer.testSetUp()
         except Exception:
-            print "Hm, serious error when trying to clean up the test."
+            print("Hm, serious error when trying to clean up the test.")
             traceback.print_exc()
         # We're done, so we can yield the body.
         yield '\n'