launchpad-reviewers team mailing list archive

[Colin Watson <cjwatson@xxxxxxxxxxxxx>]

Colin Watson has proposed merging ~cjwatson/launchpad:py3-services-inlinehelp-future-imports into launchpad:master.

Commit message:
Convert lp.services.inlinehelp to preferred __future__ imports

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~cjwatson/launchpad/+git/launchpad/+merge/395906
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/launchpad:py3-services-inlinehelp-future-imports into launchpad:master.

diff --git a/lib/lp/services/inlinehelp/README.txt b/lib/lp/services/inlinehelp/README.txt
index c9df990..1f533c3 100644
--- a/lib/lp/services/inlinehelp/README.txt
+++ b/lib/lp/services/inlinehelp/README.txt
@@ -53,10 +53,10 @@ The help folder is registered on the ILaunchpadRoot interface.
     >>> isinstance(help_view, HelpFolder)
     True
 
-    >>> print help_view.__name__
+    >>> print(help_view.__name__)
     +help
 
-    >>> print help_view.__class__.__name__
+    >>> print(help_view.__class__.__name__)
     +help for /tmp/help...
 
 
diff --git a/lib/lp/services/inlinehelp/browser.py b/lib/lp/services/inlinehelp/browser.py
index d553934..a851ad1 100644
--- a/lib/lp/services/inlinehelp/browser.py
+++ b/lib/lp/services/inlinehelp/browser.py
@@ -7,6 +7,8 @@ This package contains a base Help Folder implementation along a ZCML directive
 for registering help folders.
 """
 
+from __future__ import absolute_import, print_function, unicode_literals
+
 __metaclass__ = type
 __all__ = [
     'HelpFolder',
diff --git a/lib/lp/services/inlinehelp/tests/test_doc.py b/lib/lp/services/inlinehelp/tests/test_doc.py
index 4b78850..fe8955d 100644
--- a/lib/lp/services/inlinehelp/tests/test_doc.py
+++ b/lib/lp/services/inlinehelp/tests/test_doc.py
@@ -5,8 +5,14 @@
 Run the doctests.
 """
 
-from lp.testing.systemdocs import LayeredDocFileSuite
+from __future__ import absolute_import, print_function, unicode_literals
+
+from lp.testing.systemdocs import (
+    LayeredDocFileSuite,
+    setGlobs,
+    )
 
 
 def test_suite():
-    return LayeredDocFileSuite('../README.txt')
+    return LayeredDocFileSuite(
+        '../README.txt', setUp=lambda test: setGlobs(test, future=True))
diff --git a/lib/lp/services/inlinehelp/zcml.py b/lib/lp/services/inlinehelp/zcml.py
index a2754da..13909f7 100644
--- a/lib/lp/services/inlinehelp/zcml.py
+++ b/lib/lp/services/inlinehelp/zcml.py
@@ -3,6 +3,8 @@
 
 """ZCML directive for help folder registrations."""
 
+from __future__ import absolute_import, print_function, unicode_literals
+
 __metaclass__ = type
 __all__ = []