Merge lp:~cjwatson/lazr.restful/py3-print into lp:lazr.restful

[Colin Watson]

Apply absolute_import and print_function __future__ imports.

There's some minor fiddling to get doctests set up properly, but aside from that this is a more or less mechanical translation to Python 3's print syntax.

[Kristian Glass (doismellburning)]

I skimmed and sample-reviewed this and what I saw looked good - given the nature of it, I'd happily approve merging it on that basis

review: Approve

=== modified file 'src/lazr/restful/__init__.py'
--- src/lazr/restful/__init__.py	2009-08-05 17:34:30 +0000
+++ src/lazr/restful/__init__.py	2020-02-04 11:56:15 +0000
@@ -17,6 +17,8 @@
 
 # pylint: disable-msg=W0401
 
+from __future__ import absolute_import, print_function
+
 import pkg_resources
 __version__ = pkg_resources.resource_string("lazr.restful", "version.txt").strip()
 

=== modified file 'src/lazr/restful/_bytestorage.py'
--- src/lazr/restful/_bytestorage.py	2016-02-17 01:07:21 +0000
+++ src/lazr/restful/_bytestorage.py	2020-02-04 11:56:15 +0000
@@ -16,6 +16,8 @@
 
 """Classes for a resource that implements a binary file repository."""
 
+from __future__ import absolute_import, print_function
+
 __metaclass__ = type
 __all__ = [
     'ByteStorageResource',

=== modified file 'src/lazr/restful/_operation.py'
--- src/lazr/restful/_operation.py	2018-04-23 12:42:00 +0000
+++ src/lazr/restful/_operation.py	2020-02-04 11:56:15 +0000
@@ -2,6 +2,8 @@
 
 """Base classes for one-off HTTP operations."""
 
+from __future__ import absolute_import, print_function
+
 import simplejson
 
 from zope.component import getMultiAdapter, getUtility, queryMultiAdapter

=== modified file 'src/lazr/restful/_resource.py'
--- src/lazr/restful/_resource.py	2019-11-12 14:26:41 +0000
+++ src/lazr/restful/_resource.py	2020-02-04 11:56:15 +0000
@@ -2,6 +2,8 @@
 
 """Base classes for HTTP resources."""
 
+from __future__ import absolute_import, print_function
+
 __metaclass__ = type
 
 __all__ = [

=== modified file 'src/lazr/restful/debug.py'
--- src/lazr/restful/debug.py	2009-04-06 11:59:33 +0000
+++ src/lazr/restful/debug.py	2020-02-04 11:56:15 +0000
@@ -2,6 +2,8 @@
 
 """Module docstring goes here."""
 
+from __future__ import absolute_import, print_function
+
 __metaclass__ = type
 __all__ = [
     "debug_proxy",
@@ -64,7 +66,7 @@
 def debug_proxy(obj):
     """Return informative text about the proxies wrapping obj.
 
-    Usually used like print debug_proxy(obj).
+    Usually used like print(debug_proxy(obj)).
     """
     if not zope.proxy.isProxy(obj):
         return "%r doesn't have any proxies." % obj
@@ -73,6 +75,5 @@
         if not zope.proxy.isProxy(proxy):
             break
         printer = proxy_formatters.get(type(proxy), default_proxy_formatter)
-        print >>buf, printer(proxy)
+        print(printer(proxy), file=buf)
     return buf.getvalue()
-

=== modified file 'src/lazr/restful/declarations.py'
--- src/lazr/restful/declarations.py	2018-09-28 15:46:34 +0000
+++ src/lazr/restful/declarations.py	2020-02-04 11:56:15 +0000
@@ -2,6 +2,8 @@
 
 """Declaration helpers to define a web service."""
 
+from __future__ import absolute_import, print_function
+
 __metaclass__ = type
 __all__ = [
     'COLLECTION_TYPE',

=== modified file 'src/lazr/restful/directives/__init__.py'
--- src/lazr/restful/directives/__init__.py	2018-04-23 12:42:00 +0000
+++ src/lazr/restful/directives/__init__.py	2020-02-04 11:56:15 +0000
@@ -2,6 +2,8 @@
 
 """Martian directives used in lazr.restful."""
 
+from __future__ import absolute_import, print_function
+
 __metaclass__ = type
 __all__ = ['request_class',
            'publication_class',

=== modified file 'src/lazr/restful/docs/absoluteurl.rst'
--- src/lazr/restful/docs/absoluteurl.rst	2019-11-04 09:54:43 +0000
+++ src/lazr/restful/docs/absoluteurl.rst	2020-02-04 11:56:15 +0000
@@ -56,13 +56,13 @@
 Calling the RootResourceAbsoluteURL will give the service root's
 absolute URL.
 
-    >>> print adapter()
+    >>> print(adapter())
     https://hostname:1000/root_uri_prefix/active_version/
 
 Converting the adapter to a string will give the same result, but
 without the trailing slash.
 
-    >>> print str(adapter)
+    >>> print(str(adapter))
     https://hostname:1000/root_uri_prefix/active_version
 
 (This is useful for the recursive case. When finding the URL to a
@@ -74,11 +74,11 @@
 Changing the web service configuration changes the generated URLs.
 
     >>> configuration.use_https = False
-    >>> print getMultiAdapter((resource, request), IAbsoluteURL)()
+    >>> print(getMultiAdapter((resource, request), IAbsoluteURL)())
     http://hostname:1000/root_uri_prefix/active_version/
 
     >>> configuration.port = None
-    >>> print getMultiAdapter((resource, request), IAbsoluteURL)()
+    >>> print(getMultiAdapter((resource, request), IAbsoluteURL)())
     http://hostname/root_uri_prefix/active_version/
 
 The URL generated includes a version identifier taken from the
@@ -87,7 +87,7 @@
     >>> request.annotations[request.VERSION_ANNOTATION] = (
     ...     'latest_version')
     >>> adapter = getMultiAdapter((resource, request), IAbsoluteURL)
-    >>> print adapter()
+    >>> print(adapter())
     http://hostname/root_uri_prefix/latest_version/
 
 For purposes of URL generation, the annotation doesn't have to be a
@@ -96,7 +96,7 @@
     >>> request.annotations[request.VERSION_ANNOTATION] = (
     ...     'no_such_version')
     >>> adapter = getMultiAdapter((resource, request), IAbsoluteURL)
-    >>> print adapter()
+    >>> print(adapter())
     http://hostname/root_uri_prefix/no_such_version/
 
 (However, the lazr.restful traversal code will reject an invalid
@@ -168,7 +168,7 @@
 followed by two from the ChildResource itself.
 
     >>> resource = ChildResource()
-    >>> print str(getMultiAdapter((resource, request), IAbsoluteURL))
+    >>> print(str(getMultiAdapter((resource, request), IAbsoluteURL)))
     http://dummyurl/child-part1/child-part2
 
 Now let's put an object underneath the child resource that implements
@@ -184,8 +184,8 @@
 resource, the two from the ChildResource, and one from the
 GrandchildResource itself.
 
-    >>> print str(getMultiAdapter(
-    ...     (GrandchildResource(), request), IAbsoluteURL))
+    >>> print(str(getMultiAdapter(
+    ...     (GrandchildResource(), request), IAbsoluteURL)))
     http://dummyurl/child-part1/child-part2/grandchild
 
 Edge cases and error handling
@@ -195,7 +195,7 @@
 It even escapes slashes, if a slash shows up inside a path part.
 
     >>> resource.__path_parts__ = ["!foo!", "bar/baz"]
-    >>> print str(getMultiAdapter((resource, request), IAbsoluteURL))
+    >>> print(str(getMultiAdapter((resource, request), IAbsoluteURL)))
     http://dummyurl/%21foo%21/bar%2Fbaz
 
 If the __path_parts__ is not iterable, an attempt to get the URL

=== modified file 'src/lazr/restful/docs/checker-utilities.rst'
--- src/lazr/restful/docs/checker-utilities.rst	2019-11-04 09:54:43 +0000
+++ src/lazr/restful/docs/checker-utilities.rst	2020-02-04 11:56:15 +0000
@@ -46,7 +46,7 @@
 
 ProxyFactory wraps the content using the defined checker.
 
-    >>> print debug_proxy(ProxyFactory(content))
+    >>> print(debug_proxy(ProxyFactory(content)))
     zope.security._proxy._Proxy (using zope.security.checker.Checker)
         public: aMethod, a_field, a_read_only_field, an_attr
 
@@ -55,7 +55,7 @@
 
     >>> undefineChecker(MyContent)
     >>> protect_schema(MyContent, MySchema, read_permission='lazr.View')
-    >>> print debug_proxy(ProxyFactory(content))
+    >>> print(debug_proxy(ProxyFactory(content)))
     zope.security._proxy._Proxy (using zope.security.checker.Checker)
         lazr.View: aMethod, a_field, a_read_only_field, an_attr
 
@@ -64,7 +64,7 @@
 
     >>> undefineChecker(MyContent)
     >>> protect_schema(MyContent, MySchema, write_permission='lazr.Edit')
-    >>> print debug_proxy(ProxyFactory(content))
+    >>> print(debug_proxy(ProxyFactory(content)))
     zope.security._proxy._Proxy (using zope.security.checker.Checker)
         lazr.Edit (set): a_field, an_attr
         public: aMethod, a_field, a_read_only_field, an_attr

=== modified file 'src/lazr/restful/docs/debug.rst'
--- src/lazr/restful/docs/debug.rst	2019-11-04 09:54:43 +0000
+++ src/lazr/restful/docs/debug.rst	2020-02-04 11:56:15 +0000
@@ -15,14 +15,14 @@
 
 In the simple case, where no proxy is used, as simple message is output:
 
-    >>> print debug_proxy(1)
+    >>> print(debug_proxy(1))
     1 doesn't have any proxies.
 
 Otherwise, it prints the proxy type for each proxy used:
 
     >>> from zope.proxy import ProxyBase
 
-    >>> print debug_proxy(ProxyBase(1))
+    >>> print(debug_proxy(ProxyBase(1)))
     zope.proxy.ProxyBase
 
 If more than one proxy is used, information about the proxies will be
@@ -31,7 +31,7 @@
     >>> class SimpleProxy(ProxyBase):
     ...     """A very simple proxy."""
 
-    >>> print debug_proxy(SimpleProxy(ProxyBase(1)))
+    >>> print(debug_proxy(SimpleProxy(ProxyBase(1))))
     SimpleProxy
     zope.proxy.ProxyBase
 
@@ -45,7 +45,7 @@
     ...                   {'value': CheckerPublic,
     ...                    'some_other_value': 'lazr.Edit'})
     >>> p = ProxyFactory(1, checker)
-    >>> print debug_proxy(p)
+    >>> print(debug_proxy(p))
     zope.security._proxy._Proxy (using zope.security.checker.Checker)
         lazr.Edit: __add__
         lazr.Edit (set): some_other_value

=== modified file 'src/lazr/restful/docs/django.rst'
--- src/lazr/restful/docs/django.rst	2019-11-04 09:54:43 +0000
+++ src/lazr/restful/docs/django.rst	2020-02-04 11:56:15 +0000
@@ -166,7 +166,7 @@
     >>> from zope.location.interfaces import ILocation
     >>> resource = SubordinateResource()
     >>> as_location = ILocation(resource)
-    >>> print as_location.__name__
+    >>> print(as_location.__name__)
     myname
 
 It's also possible to adapt a Django model object to IAbsoluteURL and
@@ -176,7 +176,7 @@
     >>> from zope.traversing.browser.interfaces import IAbsoluteURL
     >>> from lazr.restful.simple import Request
     >>> request = Request("", {})
-    >>> print str(getMultiAdapter((resource, request), IAbsoluteURL))
+    >>> print(str(getMultiAdapter((resource, request), IAbsoluteURL)))
     http://dummyurl/myname
 
 
@@ -227,7 +227,7 @@
     >>> len(sequence)
     3
 
-    >>> print sequence[1]
+    >>> print(sequence[1])
     bar
 
     >>> sequence[1:3]

=== modified file 'src/lazr/restful/docs/interface.rst'
--- src/lazr/restful/docs/interface.rst	2019-11-04 09:54:43 +0000
+++ src/lazr/restful/docs/interface.rst	2020-02-04 11:56:15 +0000
@@ -52,9 +52,9 @@
 
     >>> sorted(MyForm1.names())
     ['age', 'name']
-    >>> print MyForm1.get('age').title
+    >>> print(MyForm1.get('age').title)
     Your age:
-    >>> print MyForm1.get('name').title
+    >>> print(MyForm1.get('name').title)
     Your name:
 
 The interface attribute points to the correct interface:
@@ -64,7 +64,7 @@
 
 And the original field wasn't updated:
 
-    >>> print MyModel.get('age').title
+    >>> print(MyModel.get('age').title)
     Number of years since birth
     >>> MyModel.get('name').interface is MyModel
     True
@@ -132,7 +132,7 @@
 
 The interface attribute is cleared:
 
-    >>> print illuminated.interface
+    >>> print(illuminated.interface)
     None
 
 It also supports the Field ordering (the copied field will have an

=== modified file 'src/lazr/restful/docs/multiversion.rst'
--- src/lazr/restful/docs/multiversion.rst	2019-11-04 09:54:43 +0000
+++ src/lazr/restful/docs/multiversion.rst	2020-02-04 11:56:15 +0000
@@ -433,19 +433,19 @@
     >>> request_beta = create_web_service_request('/beta/')
     >>> alsoProvides(request_beta, IBetaVersion)
     >>> beta_entry = getMultiAdapter((C1, request_beta), IEntry)
-    >>> print beta_entry.fax
+    >>> print(beta_entry.fax)
     111-2121
 
     >>> request_10 = create_web_service_request('/1.0/')
     >>> alsoProvides(request_10, I10Version)
     >>> one_oh_entry = getMultiAdapter((C1, request_10), IEntry)
-    >>> print one_oh_entry.fax_number
+    >>> print(one_oh_entry.fax_number)
     111-2121
 
     >>> request_dev = create_web_service_request('/dev/')
     >>> alsoProvides(request_dev, IDevVersion)
     >>> dev_entry = getMultiAdapter((C1, request_dev), IEntry)
-    >>> print dev_entry.fax
+    >>> print(dev_entry.fax)
     Traceback (most recent call last):
     ...
     AttributeError: 'ContactEntryDev' object has no attribute 'fax'
@@ -636,17 +636,17 @@
     ...         RootResourceAbsoluteURL, [cls, IBrowserRequest])
 
     >>> beta_request = create_web_service_request('/beta/')
-    >>> print beta_request.traverse(None)
+    >>> print(beta_request.traverse(None))
     <BetaServiceRootResource object...>
 
-    >>> print absoluteURL(beta_app, beta_request)
+    >>> print(absoluteURL(beta_app, beta_request))
     http://api.multiversion.dev/beta/
 
     >>> dev_request = create_web_service_request('/dev/')
-    >>> print dev_request.traverse(None)
+    >>> print(dev_request.traverse(None))
     <PostBetaServiceRootResource object...>
 
-    >>> print absoluteURL(dev_app, dev_request)
+    >>> print(absoluteURL(dev_app, dev_request))
     http://api.multiversion.dev/dev/
 
 Request lifecycle
@@ -668,7 +668,7 @@
     <BetaServiceRootResource object ...>
     >>> IBetaVersion.providedBy(request_beta)
     True
-    >>> print request_beta.version
+    >>> print(request_beta.version)
     beta
 
 Using the web service
@@ -686,10 +686,10 @@
     >>> request = create_web_service_request('/beta/')
     >>> resource = request.traverse(None)
     >>> body = simplejson.loads(resource())
-    >>> print sorted(body.keys())
+    >>> print(sorted(body.keys()))
     ['contacts_collection_link', 'resource_type_link']
 
-    >>> print body['contacts_collection_link']
+    >>> print(body['contacts_collection_link'])
     http://api.multiversion.dev/beta/contact_list
 
 Here's the contact list.
@@ -701,7 +701,7 @@
 but since we happen to know which object it is, we can pass it into
 absoluteURL along with the request object, and get the correct URL.
 
-    >>> print absoluteURL(contact_set, request)
+    >>> print(absoluteURL(contact_set, request))
     http://api.multiversion.dev/beta/contact_list
 
     >>> body = simplejson.loads(resource())
@@ -709,7 +709,7 @@
     3
     >>> for link in sorted(
     ...     [contact['self_link'] for contact in body['entries']]):
-    ...     print link
+    ...     print(link)
     http://api.multiversion.dev/beta/contact_list/Cleo%20Python
     http://api.multiversion.dev/beta/contact_list/Fax-your-order%20Pizza
     http://api.multiversion.dev/beta/contact_list/Oliver%20Bluth
@@ -725,15 +725,15 @@
 pass it into absoluteURL along with this request object, and get the
 object's URL.
 
-    >>> print C1.name
+    >>> print(C1.name)
     Cleo Python
-    >>> print absoluteURL(C1, request_beta)
+    >>> print(absoluteURL(C1, request_beta))
     http://api.multiversion.dev/beta/contact_list/Cleo%20Python
 
     >>> body = simplejson.loads(resource())
     >>> sorted(body.keys())
     ['fax', 'http_etag', 'name', 'phone', 'resource_type_link', 'self_link']
-    >>> print body['name']
+    >>> print(body['name'])
     Cleo Python
 
 We can traverse through an entry to one of its fields.
@@ -741,7 +741,7 @@
     >>> request_beta = create_web_service_request(
     ...     '/beta/contact_list/Cleo Python/fax')
     >>> field = request_beta.traverse(None)
-    >>> print simplejson.loads(field())
+    >>> print(simplejson.loads(field()))
     111-2121
 
 We can invoke a named operation, and it returns a total_size (because
@@ -778,13 +778,13 @@
     >>> request = create_web_service_request('/1.0/')
     >>> resource = request.traverse(None)
     >>> body = simplejson.loads(resource())
-    >>> print sorted(body.keys())
+    >>> print(sorted(body.keys()))
     ['contacts_collection_link', 'resource_type_link']
 
 Note that 'contacts_collection_link' points to a different URL in
 '1.0' than in 'dev'.
 
-    >>> print body['contacts_collection_link']
+    >>> print(body['contacts_collection_link'])
     http://api.multiversion.dev/1.0/contacts
 
 An attempt to use the 'beta' name of the contact list in the '1.0' web
@@ -800,7 +800,7 @@
 
     >>> request = create_web_service_request('/1.0/contacts')
     >>> resource = request.traverse(None)
-    >>> print absoluteURL(contact_set, request)
+    >>> print(absoluteURL(contact_set, request))
     http://api.multiversion.dev/1.0/contacts
 
     >>> body = simplejson.loads(resource())
@@ -808,7 +808,7 @@
     3
     >>> for link in sorted(
     ...     [contact['self_link'] for contact in body['entries']]):
-    ...     print link
+    ...     print(link)
     http://api.multiversion.dev/1.0/contacts/Cleo%20Python
     http://api.multiversion.dev/1.0/contacts/Fax-your-order%20Pizza
     http://api.multiversion.dev/1.0/contacts/Oliver%20Bluth
@@ -818,7 +818,7 @@
     >>> request_10 = create_web_service_request(
     ...     '/1.0/contacts/Cleo Python')
     >>> resource = request_10.traverse(None)
-    >>> print absoluteURL(C1, request_10)
+    >>> print(absoluteURL(C1, request_10))
     http://api.multiversion.dev/1.0/contacts/Cleo%20Python
 
 Note that the 'fax' and 'phone' fields are now called 'fax_number' and
@@ -828,7 +828,7 @@
     >>> sorted(body.keys())
     ['fax_number', 'http_etag', 'name', 'phone_number',
      'resource_type_link', 'self_link']
-    >>> print body['name']
+    >>> print(body['name'])
     Cleo Python
 
 We can traverse through an entry to one of its fields.
@@ -836,7 +836,7 @@
     >>> request_10 = create_web_service_request(
     ...     '/1.0/contacts/Cleo Python/fax_number')
     >>> field = request_10.traverse(None)
-    >>> print simplejson.loads(field())
+    >>> print(simplejson.loads(field()))
     111-2121
 
 The fax field in '1.0' is called 'fax_number', and attempting
@@ -867,7 +867,7 @@
     ...
     KeyError: 'total_size'
 
-    >>> print result['total_size_link']
+    >>> print(result['total_size_link'])
     http://.../1.0/contacts?string=e&ws.op=find&ws.show=total_size
     >>> size_request = create_web_service_request(
     ...     '/1.0/contacts',
@@ -875,7 +875,7 @@
     ...         'string=e&ws.op=find&ws.show=total_size'})
     >>> operation = size_request.traverse(None)
     >>> result = simplejson.loads(operation())
-    >>> print result
+    >>> print(result)
     3
 
 If the resultset fits on a single page, total_size will be provided
@@ -897,7 +897,7 @@
     ...     '/1.0/contacts',
     ...     environ={'QUERY_STRING' : 'ws.op=findContacts&string=Cleo'})
     >>> operation = request_10.traverse(None)
-    >>> print operation()
+    >>> print(operation())
     No such operation: findContacts
 
 Dev
@@ -908,17 +908,17 @@
     >>> request = create_web_service_request('/dev/')
     >>> resource = request.traverse(None)
     >>> body = simplejson.loads(resource())
-    >>> print sorted(body.keys())
+    >>> print(sorted(body.keys()))
     ['contacts_collection_link', 'resource_type_link']
 
-    >>> print body['contacts_collection_link']
+    >>> print(body['contacts_collection_link'])
     http://api.multiversion.dev/dev/contacts
 
 Here's the contact list.
 
     >>> request_dev = create_web_service_request('/dev/contacts')
     >>> resource = request_dev.traverse(None)
-    >>> print absoluteURL(contact_set, request_dev)
+    >>> print(absoluteURL(contact_set, request_dev))
     http://api.multiversion.dev/dev/contacts
 
     >>> body = simplejson.loads(resource())
@@ -926,7 +926,7 @@
     2
     >>> for link in sorted(
     ...     [contact['self_link'] for contact in body['entries']]):
-    ...     print link
+    ...     print(link)
     http://api.multiversion.dev/dev/contacts/Cleo%20Python
     http://api.multiversion.dev/dev/contacts/Oliver%20Bluth
 
@@ -935,7 +935,7 @@
     >>> request_dev = create_web_service_request(
     ...     '/dev/contacts/Cleo Python')
     >>> resource = request_dev.traverse(None)
-    >>> print absoluteURL(C1, request_dev)
+    >>> print(absoluteURL(C1, request_dev))
     http://api.multiversion.dev/dev/contacts/Cleo%20Python
 
 Note that the published field names have changed between 'dev' and
@@ -945,7 +945,7 @@
     >>> body = simplejson.loads(resource())
     >>> sorted(body.keys())
     ['http_etag', 'name', 'phone_number', 'resource_type_link', 'self_link']
-    >>> print body['name']
+    >>> print(body['name'])
     Cleo Python
 
 We can traverse through an entry to one of its fields.
@@ -953,7 +953,7 @@
     >>> request_dev = create_web_service_request(
     ...     '/dev/contacts/Cleo Python/name')
     >>> field = request_dev.traverse(None)
-    >>> print simplejson.loads(field())
+    >>> print(simplejson.loads(field()))
     Cleo Python
 
 We cannot use 'dev' to traverse to a field not published in the 'dev'

=== modified file 'src/lazr/restful/docs/utils.rst'
--- src/lazr/restful/docs/utils.rst	2019-11-04 09:54:43 +0000
+++ src/lazr/restful/docs/utils.rst	2020-02-04 11:56:15 +0000
@@ -39,9 +39,9 @@
     Traceback (most recent call last):
     ...
     KeyError: 'key'
-    >>> print stack.get('key')
+    >>> print(stack.get('key'))
     None
-    >>> print stack.get('key', 'default')
+    >>> print(stack.get('key', 'default'))
     default
 
     >>> del stack['key']
@@ -54,9 +54,9 @@
 
     >>> stack.push('dict #1')
     >>> stack['key'] = 'value'
-    >>> print stack['key']
+    >>> print(stack['key'])
     value
-    >>> print stack.get('key', 'default')
+    >>> print(stack.get('key', 'default'))
     value
 
     >>> 'key' in stack
@@ -70,9 +70,9 @@
 dictionary.
 
     >>> pair = stack.pop()
-    >>> print pair.version
+    >>> print(pair.version)
     dict #1
-    >>> print pair.object
+    >>> print(pair.object)
      {'key': 'value'}
 
     >>> stack.push('dict #1')
@@ -84,9 +84,9 @@
 objects in the first.
 
     >>> stack.push('dict #2')
-    >>> print stack['key']
+    >>> print(stack['key'])
     value
-    >>> print stack['key2']
+    >>> print(stack['key2'])
     {'key': 'value'}
 
 Every dict is initialized with a deep copy of the one below it.
@@ -111,7 +111,7 @@
 You can find the dict for a given name with dict_for_name():
 
     >>> for key, value in sorted(stack.dict_for_name('dict #1').items()):
-    ...     print "%s: %s" % (key, value)
+    ...     print("%s: %s" % (key, value))
     key: value
     key2: {'key': 'value'}
 
@@ -128,7 +128,7 @@
 VersionedDict not to copy in values from the next lowest dictionary
 in the stack.
 
-    >>> print stack['key']
+    >>> print(stack['key'])
     Second dict value
 
     >>> stack.push("An empty dictionary", empty=True)
@@ -153,15 +153,15 @@
     KeyError: 'key2'
 
     >>> stack['key'] = 'Brand new value'
-    >>> print stack['key']
+    >>> print(stack['key'])
     Brand new value
 
 If you pop the formerly empty dictionary off the stack...
 
     >>> pair = stack.pop()
-    >>> print pair.version
+    >>> print(pair.version)
     An empty dictionary
-    >>> print pair.object
+    >>> print(pair.object)
     {'key': 'Brand new value'}
 
 ...'key' and 'key2' are visible again.
@@ -195,15 +195,15 @@
     ...     'TwoFields', ITwoFields,
     ...     {'field_1': 'foo', 'field_2': 'bar', 'a_method': result})
 
-    >>> print implementation.__name__
+    >>> print(implementation.__name__)
     TwoFields
     >>> ITwoFields.implementedBy(implementation)
     True
-    >>> print implementation.field_1
+    >>> print(implementation.field_1)
     foo
-    >>> print implementation.field_2
+    >>> print(implementation.field_2)
     bar
-    >>> print implementation().a_method()
+    >>> print(implementation().a_method())
     result
 
 If one of the interface's attributes is not defined in the dictionary,
@@ -214,7 +214,7 @@
     >>> implementation = implement_from_dict(
     ...     'TwoFields', ITwoFields, {})
 
-    >>> print implementation.field_1
+    >>> print(implementation.field_1)
     field_1 default
 
 If an attribute is not present in the dictionary and its interface
@@ -241,7 +241,7 @@
     >>> implementation = implement_from_dict(
     ...     'TwoFields', ITwoFields, {}, superclass=TwoFieldsSuperclass)
 
-    >>> print implementation().a_method()
+    >>> print(implementation().a_method())
     superclass result
 
 make_identifier_safe
@@ -251,22 +251,22 @@
 string that can be used as a Python identifier.
 
     >>> from lazr.restful.utils import make_identifier_safe
-    >>> print make_identifier_safe("already_a_valid_IDENTIFIER_444")
+    >>> print(make_identifier_safe("already_a_valid_IDENTIFIER_444"))
     already_a_valid_IDENTIFIER_444
 
-    >>> print make_identifier_safe("!starts_with_punctuation")
+    >>> print(make_identifier_safe("!starts_with_punctuation"))
     _starts_with_punctuation
 
-    >>> print make_identifier_safe("_!contains!pu-nc.tuation")
+    >>> print(make_identifier_safe("_!contains!pu-nc.tuation"))
     __contains_pu_nc_tuation
 
-    >>> print make_identifier_safe("contains\nnewline")
+    >>> print(make_identifier_safe("contains\nnewline"))
     contains_newline
 
-    >>> print make_identifier_safe("")
+    >>> print(make_identifier_safe(""))
     _
 
-    >>> print make_identifier_safe(None)
+    >>> print(make_identifier_safe(None))
     Traceback (most recent call last):
     ...
     ValueError: Cannot make None value identifier-safe.
@@ -354,9 +354,9 @@
 code.
 
     >>> from lazr.restful.utils import safe_js_escape
-    >>> print safe_js_escape('John "nasty" O\'Brien')
+    >>> print(safe_js_escape('John "nasty" O\'Brien'))
     "John &quot;nasty&quot; O'Brien"
-    >>> print safe_js_escape("John O\'Brien")
+    >>> print(safe_js_escape("John O\'Brien"))
     "John O'Brien"
-    >>> print safe_js_escape("John <strong>O\'Brien</strong>")
+    >>> print(safe_js_escape("John <strong>O\'Brien</strong>"))
     "John &lt;strong&gt;O'Brien&lt;/strong&gt;"

=== modified file 'src/lazr/restful/docs/webservice-declarations.rst'
--- src/lazr/restful/docs/webservice-declarations.rst	2019-11-04 17:40:25 +0000
+++ src/lazr/restful/docs/webservice-declarations.rst	2020-02-04 11:56:15 +0000
@@ -63,11 +63,11 @@
     ...             return repr(value)
     ...     tag = element.queryTaggedValue('lazr.restful.exported')
     ...     if tag is None:
-    ...         print "tag 'lazr.restful.exported' is not present"
+    ...         print("tag 'lazr.restful.exported' is not present")
     ...     else:
-    ...         print "\n".join(
+    ...         print("\n".join(
     ...             "%s: %s" %(key, format_value(value))
-    ...             for key, value in sorted(tag.items()))
+    ...             for key, value in sorted(tag.items())))
     >>> print_export_tag(IBook)
     _as_of_was_used: False
     contributes_to: None
@@ -465,7 +465,7 @@
 
     >>> for name, param in sorted(IBookSetOnSteroids['new'].getTaggedValue(
     ...     'lazr.restful.exported')['params'].items()):
-    ...     print "%s: %s" % (name, param.__name__)
+    ...     print("%s: %s" % (name, param.__name__))
     author: author
     base_price: price
     title: title
@@ -791,7 +791,7 @@
     ...         """Sends a message to another named object."""
 
     >>> for name in sorted(IUser.names(True)):
-    ...     print '== %s ==' % name
+    ...     print('== %s ==' % name)
     ...     print_export_tag(IUser[name])
     == name ==
     as: 'name'
@@ -937,7 +937,7 @@
     >>> def dump_entry_interface(entry_interface):
     ...     for name, field in sorted(
     ...         entry_interface.namesAndDescriptions()):
-    ...         print "%s: %s" % (name, field.__class__.__name__)
+    ...         print("%s: %s" % (name, field.__class__.__name__))
     >>> dump_entry_interface(entry_interface)
     author: TextLine
     price: Float
@@ -945,7 +945,7 @@
 
 The field __name__ attribute contains the exported name:
 
-    >>> print entry_interface['price'].__name__
+    >>> print(entry_interface['price'].__name__)
     price
 
 Associated with the interface through tags are automatically-generated
@@ -953,9 +953,9 @@
 
     >>> from lazr.restful.interfaces import LAZR_WEBSERVICE_NAME
     >>> tags = entry_interface.queryTaggedValue(LAZR_WEBSERVICE_NAME)
-    >>> print tags['singular']
+    >>> print(tags['singular'])
     book
-    >>> print tags['plural']
+    >>> print(tags['plural'])
     books
 
 It's an error to use generate_entry_interfaces() on an interface that
@@ -989,7 +989,7 @@
 adapter.
 
     >>> [factory] = entry_adapter_factories
-    >>> print factory.version
+    >>> print(factory.version)
     beta
     >>> entry_adapter_factory = factory.object
 
@@ -1000,7 +1000,7 @@
 
 The resulting class is named based on the interface:
 
-    >>> print entry_adapter_factory.__name__
+    >>> print(entry_adapter_factory.__name__)
     BookEntry_betaAdapter
 
 Its docstring is also copied over from the original interface:
@@ -1109,8 +1109,8 @@
     ...     """Simple ICheckedOutBookSet implementation."""
     ...
     ...     def getByTitle(self, title, user):
-    ...         print '%s searched for checked out book matching "%s".' % (
-    ...             user, title)
+    ...         print('%s searched for checked out book matching "%s".' % (
+    ...             user, title))
 
     >>> checked_out_adapter = generate_collection_adapter(
     ...     ICheckedOutBookSet)(CheckedOutBookSet(), request)
@@ -1173,7 +1173,7 @@
     >>> def print_params(params):
     ...     """Print the name and type of the defined parameters."""
     ...     for param in sorted(params, key=attrgetter('__name__')):
-    ...         print "%s: %s" % (param.__name__, param.__class__.__name__)
+    ...         print("%s: %s" % (param.__name__, param.__class__.__name__))
     >>> print_params(read_method_adapter_factory.params)
     text: TextLine
 
@@ -1208,7 +1208,7 @@
     >>> import simplejson
     >>> for key, value in sorted(
     ...         simplejson.loads(read_method_adapter.call(text='')).items()):
-    ...     print '%s: %s' % (key, value)
+    ...     print('%s: %s' % (key, value))
     entries: []
     start: 0
     total_size: 0
@@ -1225,7 +1225,7 @@
 
 The generated adapter class name is POST_<interface>_<operation>_beta.
 
-    >>> print write_method_adapter_factory.__name__
+    >>> print(write_method_adapter_factory.__name__)
     POST_IBookOnSteroids_checkout_beta
 
 The adapter's params property also contains the available parameters
@@ -1236,8 +1236,8 @@
     >>> @implementer(IBookOnSteroids)
     ... class BookOnSteroids(Book):
     ...     def checkout(self, who, kind):
-    ...         print "%s did a %s check out of '%s'." % (
-    ...             who, kind, self.title)
+    ...         print("%s did a %s check out of '%s'." % (
+    ...             who, kind, self.title))
 
     >>> write_method_adapter = write_method_adapter_factory(
     ...     BookOnSteroids(
@@ -1275,7 +1275,7 @@
 The generated adapter class name is also
 POST_<interface>_<operation>_beta.
 
-    >>> print write_method_adapter_factory.__name__
+    >>> print(write_method_adapter_factory.__name__)
     POST_IBookOnSteroids_checkout_beta
 
 The adapter's params property also contains the available parameters.
@@ -1321,7 +1321,7 @@
     >>> response = factory_method_adapter.request.response
     >>> response.status
     201
-    >>> print response.headers['Location']
+    >>> print(response.headers['Location'])
     http://api.example.org/books/Eyeless%20in%20Gaza
 
 The generate_operation_adapter() function can only be called on an
@@ -1350,7 +1350,7 @@
 The generated adapter class name is
 DELETE_<interface>_<operation>_beta.
 
-    >>> print destructor_method_adapter_factory.__name__
+    >>> print(destructor_method_adapter_factory.__name__)
     DELETE_IBookOnSteroids_destroy_beta
 
 Destructor
@@ -1451,7 +1451,7 @@
     ...     IHasText, [], [hastext_entry_interface])
 
     >>> obj = HasText()
-    >>> print hastext_entry_adapter_factory.version
+    >>> print(hastext_entry_adapter_factory.version)
     beta
     >>> hastext_entry_adapter = hastext_entry_adapter_factory.object(
     ...     obj, request)
@@ -1625,10 +1625,10 @@
     ...     ICachedBookSet['getAllBooks'])
     >>> read_method_adapter = read_method_adapter_factory(
     ...     CachedBookSet(['Cool book']), request)
-    >>> print read_method_adapter.call()
+    >>> print(read_method_adapter.call())
     ['Cool book']
     >>> for name, value in sorted(request.response.headers.items()):
-    ...     print '%s: %s' % (name, value)
+    ...     print('%s: %s' % (name, value))
     Cache-control: max-age=60
     Content-Type: application/json
 
@@ -1708,11 +1708,11 @@
     >>> interface = IMultiVersionCollection
     >>> adapter_earliest_factory = generate_collection_adapter(
     ...     interface, None)
-    >>> print adapter_earliest_factory.__name__
+    >>> print(adapter_earliest_factory.__name__)
     MultiVersionCollectionCollectionAdapter___Earliest
 
     >>> collection_earliest = adapter_earliest_factory(data_object, request)
-    >>> print collection_earliest.find()
+    >>> print(collection_earliest.find())
     ['you', 'passed', 'in', 'pre-1.0 value']
 
 Passing in '1.0' gets us the collection as it appears in the 1.0
@@ -1721,22 +1721,22 @@
 slightly different.
 
     >>> adapter_10_factory = generate_collection_adapter(interface, '1.0')
-    >>> print adapter_10_factory.__name__
+    >>> print(adapter_10_factory.__name__)
     MultiVersionCollectionCollectionAdapter_1_0
 
     >>> collection_10 = adapter_10_factory(data_object, request)
-    >>> print collection_10.find()
+    >>> print(collection_10.find())
     ['you', 'passed', 'in', '1.0 value']
 
 Passing in '2.0' gets us a collection with totally different contents,
 because a totally different method is being called.
 
     >>> adapter_20_factory = generate_collection_adapter(interface, '2.0')
-    >>> print adapter_20_factory.__name__
+    >>> print(adapter_20_factory.__name__)
     MultiVersionCollectionCollectionAdapter_2_0
 
     >>> collection_20 = adapter_20_factory(data_object, request)
-    >>> print collection_20.find()
+    >>> print(collection_20.find())
     ['contents', 'for', 'version', '2.0']
 
 An error occurs when we try to generate an adapter for a version
@@ -1792,7 +1792,7 @@
     ...     IMultiVersionEntry, [], *versions)
 
     >>> for version, interface in versions_and_interfaces:
-    ...     print version
+    ...     print(version)
     beta
     1.0
     2.0
@@ -1850,7 +1850,7 @@
     ...     IMultiVersionEntry, [], versions_and_interfaces)
 
     >>> for version, adapter in entry_adapters:
-    ...     print version
+    ...     print(version)
     beta
     1.0
     2.0
@@ -1862,22 +1862,22 @@
 Here's the 'beta' version of the object:
 
     >>> object_beta = adapter_beta(data_object, request)
-    >>> print object_beta.field
+    >>> print(object_beta.field)
     field value
-    >>> print object_beta.field3
+    >>> print(object_beta.field3)
     field 3 value
-    >>> print object_beta.unchanging_name
+    >>> print(object_beta.unchanging_name)
     unchanging value
 
 The 'field4' field is not available in the 'beta' version under any name.
 
-    >>> print object_beta.field4
+    >>> print(object_beta.field4)
     Traceback (most recent call last):
     ...
     AttributeError: 'MultiVersionEntryEntry_betaAdapter' object has no
     attribute 'field4'
 
-    >>> print object_beta.new_in_10
+    >>> print(object_beta.new_in_10)
     Traceback (most recent call last):
     ...
     AttributeError: 'MultiVersionEntryEntry_betaAdapter' object has no
@@ -1887,11 +1887,11 @@
 now available as 'new_in_10'.
 
     >>> object_10 = adapter_10(data_object, request)
-    >>> print object_10.field
+    >>> print(object_10.field)
     field value
-    >>> print object_10.unchanging_name
+    >>> print(object_10.unchanging_name)
     unchanging value
-    >>> print object_10.new_in_10
+    >>> print(object_10.new_in_10)
     1.0
 
     >>> object_10.field3
@@ -1903,26 +1903,26 @@
 Here's the '2.0' version. 'field3' is back, but now it's called '20_name'.
 
     >>> object_20 = adapter_20(data_object, request)
-    >>> print object_20.field
+    >>> print(object_20.field)
     field value
-    >>> print object_20.unchanging_name
+    >>> print(object_20.unchanging_name)
     unchanging value
-    >>> print getattr(object_20, '20_name')
+    >>> print(getattr(object_20, '20_name'))
     field 3 value
-    >>> print object_20.new_in_10
+    >>> print(object_20.new_in_10)
     1.0
 
 Here's the '3.0' version. 'field3' has been renamed to '30_name' and
 'field4' has been renamed to 'renamed_in_30'
 
     >>> object_30 = adapter_30(data_object, request)
-    >>> print object_30.field
+    >>> print(object_30.field)
     field value
-    >>> print object_30.unchanging_name
+    >>> print(object_30.unchanging_name)
     unchanging value
-    >>> print getattr(object_30, '30_name')
+    >>> print(getattr(object_30, '30_name'))
     field 3 value
-    >>> print object_30.renamed_in_30
+    >>> print(object_30.renamed_in_30)
     1.0
 
     >>> getattr(object_30, '20_name')
@@ -1958,13 +1958,13 @@
     >>> foo, bar = generate_entry_interfaces(
     ...     IAmbiguousMultiVersion, [], 'foo', 'bar')
 
-    >>> print foo.version
+    >>> print(foo.version)
     foo
     >>> dump_entry_interface(foo.object)
     field2: TextLine
     foo_name: TextLine
 
-    >>> print bar.version
+    >>> print(bar.version)
     bar
     >>> dump_entry_interface(bar.object)
     bar_name: TextLine
@@ -1986,13 +1986,13 @@
     >>> bar, foo = generate_entry_interfaces(
     ...     IAmbiguousMultiVersion, [], 'bar', 'foo')
 
-    >>> print bar.version
+    >>> print(bar.version)
     bar
     >>> dump_entry_interface(bar.object)
     bar_name: TextLine
     field1: TextLine
 
-    >>> print foo.version
+    >>> print(foo.version)
     foo
     >>> dump_entry_interface(foo.object)
     bar_name: TextLine
@@ -2167,11 +2167,11 @@
 
     >>> method = IMultiVersionMethod['a_method']
     >>> adapter_earliest_factory = generate_operation_adapter(method, None)
-    >>> print adapter_earliest_factory.__name__
+    >>> print(adapter_earliest_factory.__name__)
     GET_IMultiVersionMethod_a_method_beta
 
     >>> method_earliest = adapter_earliest_factory(data_object, request)
-    >>> print method_earliest.call(required="foo")
+    >>> print(method_earliest.call(required="foo"))
     Required value: foo. Fixed value: pre-1.0 value. User: A user.
 
 Passing in '1.0' or '2.0' gets us the method as it appears in the
@@ -2180,26 +2180,26 @@
 1.0 is 'new_name', not 'a_method'.
 
     >>> adapter_10_factory = generate_operation_adapter(method, '1.0')
-    >>> print adapter_10_factory.__name__
+    >>> print(adapter_10_factory.__name__)
     GET_IMultiVersionMethod_new_name_1_0
 
     >>> method_10 = adapter_10_factory(data_object, request)
-    >>> print method_10.call(required="bar")
+    >>> print(method_10.call(required="bar"))
     Required value: bar. Fixed value: 1.0 value. User: A user.
 
     >>> adapter_20_factory = generate_operation_adapter(method, '2.0')
-    >>> print adapter_20_factory.__name__
+    >>> print(adapter_20_factory.__name__)
     GET_IMultiVersionMethod_new_name_2_0
 
     >>> method_20 = adapter_20_factory(data_object, request)
-    >>> print method_20.call(required="baz")
+    >>> print(method_20.call(required="baz"))
     Required value: baz. Fixed value: 2.0 value. User: A user.
 
     >>> adapter_30_factory = generate_operation_adapter(method, '3.0')
-    >>> print adapter_30_factory.__name__
+    >>> print(adapter_30_factory.__name__)
     GET_IMultiVersionMethod_new_name_3_0
     >>> method_30 = adapter_30_factory(data_object, request)
-    >>> print method_30.call(required="baz")
+    >>> print(method_30.call(required="baz"))
     Required value: baz. Fixed value: 2.0 value. User: A user.
 
 An error occurs when we try to generate an adapter for a version
@@ -2228,9 +2228,9 @@
 arguments ('2.0 value' and REQUEST_USER) from the 2.0 version, but it
 also sets a new value for 'cache_for'.
 
-    >>> print dictionary['as']
+    >>> print(dictionary['as'])
     new_name
-    >>> print pformat(dictionary['call_with'])
+    >>> print(pformat(dictionary['call_with']))
     {'fixed': '2.0 value',
      'user': <class '...REQUEST_USER'>}
     >>> dictionary['cache_for']
@@ -2242,9 +2242,9 @@
 value for 'cache_for' from version 1.0.
 
     >>> ignored = dictionary.pop()
-    >>> print dictionary['as']
+    >>> print(dictionary['as'])
     new_name
-    >>> print pformat(dictionary['call_with'])
+    >>> print(pformat(dictionary['call_with']))
     {'fixed': '2.0 value',
      'user': <class '...REQUEST_USER'>}
     >>> dictionary['cache_for']
@@ -2253,7 +2253,7 @@
 The published name of the 'required' argument is 'required_argument',
 not 'required'.
 
-    >>> print dictionary['params']['required'].__name__
+    >>> print(dictionary['params']['required'].__name__)
     required_argument
 
 Let's pop the 2.0 version off the stack. Now we can see how the method
@@ -2262,12 +2262,12 @@
 is fixed to the string '1.0 value'.
 
     >>> ignored = dictionary.pop()
-    >>> print dictionary['as']
+    >>> print(dictionary['as'])
     new_name
-    >>> print pformat(dictionary['call_with'])
+    >>> print(pformat(dictionary['call_with']))
     {'fixed': '1.0 value',
      'user': <class '...REQUEST_USER'>}
-    >>> print dictionary['params']['required'].__name__
+    >>> print(dictionary['params']['required'].__name__)
     required_argument
     >>> dictionary['cache_for']
     100
@@ -2278,11 +2278,11 @@
 'fixed' argument is fixed to the string 'pre-1.0 value'.
 
     >>> ignored = dictionary.pop()
-    >>> print dictionary['as']
+    >>> print(dictionary['as'])
     a_method
-    >>> print dictionary['params']['required'].__name__
+    >>> print(dictionary['params']['required'].__name__)
     required
-    >>> print pformat(dictionary['call_with'])
+    >>> print(pformat(dictionary['call_with']))
     {'fixed': 'pre-1.0 value',
      'user': <class '...REQUEST_USER'>}
     >>> dictionary['cache_for']
@@ -2313,7 +2313,7 @@
 The method is not present in 2.0:
 
     >>> version, attrs = dictionary.pop()
-    >>> print version
+    >>> print(version)
     2.0
     >>> sorted(attrs.items())
     [('type', 'removed_operation')]
@@ -2321,20 +2321,20 @@
 It is present in 1.0:
 
     >>> version, attrs = dictionary.pop()
-    >>> print version
+    >>> print(version)
     1.0
-    >>> print attrs['type']
+    >>> print(attrs['type'])
     read_operation
-    >>> print attrs['params']['arg']
+    >>> print(attrs['params']['arg'])
     <zope.schema._field.Float object...>
 
 But it's not present in the unnamed pre-1.0 version, since it hadn't
 been defined yet:
 
     >>> pre_10 = dictionary.pop()
-    >>> print pre_10.version
+    >>> print(pre_10.version)
     None
-    >>> print pre_10.object
+    >>> print(pre_10.object)
     {'type': 'removed_operation'}
 
 The @operation_removed_in_version declaration can also be used to
@@ -2372,22 +2372,22 @@
 takes two TextLine arguments and has no special return value.
 
     >>> version, attrs = dictionary.pop()
-    >>> print version
+    >>> print(version)
     1.0
-    >>> print attrs['type']
+    >>> print(attrs['type'])
     write_operation
     >>> attrs['params']['arg']
     <zope.schema._bootstrapfields.TextLine object...>
     >>> attrs['params']['arg2']
     <zope.schema._bootstrapfields.TextLine object...>
-    >>> print attrs.get('return_type')
+    >>> print(attrs.get('return_type'))
     None
 
 In the unnamed pre-1.0 version, the 'method' operation is a read
 operation that takes a single Float argument and returns a collection.
 
     >>> version, attrs = dictionary.pop()
-    >>> print attrs['type']
+    >>> print(attrs['type'])
     read_operation
 
     >>> attrs['params']['arg']
@@ -2577,24 +2577,24 @@
     >>> from zope.security.checker import ProxyFactory
 
     # ProxyFactory wraps the content using the defined checker.
-    >>> print debug_proxy(ProxyFactory(entry_adapter))
+    >>> print(debug_proxy(ProxyFactory(entry_adapter)))
     zope.security._proxy._Proxy (using zope.security.checker.Checker)
         public: author, price, schema, title
         public (set): author, price, schema, title
 
-    >>> print debug_proxy(ProxyFactory(collection_adapter))
+    >>> print(debug_proxy(ProxyFactory(collection_adapter)))
     zope.security._proxy._Proxy (using zope.security.checker.Checker)
         public: entry_schema, find
 
-    >>> print debug_proxy(ProxyFactory(read_method_adapter))
+    >>> print(debug_proxy(ProxyFactory(read_method_adapter)))
     zope.security._proxy._Proxy (using zope.security.checker.Checker)
         public: __call__, return_type, send_modification_event
 
-    >>> print debug_proxy(ProxyFactory(write_method_adapter))
+    >>> print(debug_proxy(ProxyFactory(write_method_adapter)))
     zope.security._proxy._Proxy (using zope.security.checker.Checker)
         public: __call__, send_modification_event
 
-    >>> print debug_proxy(ProxyFactory(factory_method_adapter))
+    >>> print(debug_proxy(ProxyFactory(factory_method_adapter)))
     zope.security._proxy._Proxy (using zope.security.checker.Checker)
         public: __call__, send_modification_event
 
@@ -2624,7 +2624,7 @@
     >>> verifyObject(IEntry, entry_adapter)
     True
 
-    >>> print entry_adapter.schema.__name__
+    >>> print(entry_adapter.schema.__name__)
     IBookEntry_beta
     >>> verifyObject(entry_adapter.schema, entry_adapter)
     True
@@ -2874,7 +2874,7 @@
 The operation is not available in 'beta', because it hasn't been
 defined yet.
 
-    >>> print operation_for(context, 'beta', 'set_value').__class__.__name__
+    >>> print(operation_for(context, 'beta', 'set_value').__class__.__name__)
     Traceback (most recent call last):
     ...
     ComponentLookupError: ...
@@ -2884,10 +2884,10 @@
 1.0. This is because the operation doesn't become a mutator operation
 until 3.0.
 
-    >>> print operation_for(context, '1.0', 'set_value').__class__.__name__
+    >>> print(operation_for(context, '1.0', 'set_value').__class__.__name__)
     POST_IOperationPromotedToMutator_set_value_1_0
 
-    >>> print operation_for(context, '2.0', 'set_value').__class__.__name__
+    >>> print(operation_for(context, '2.0', 'set_value').__class__.__name__)
     POST_IOperationPromotedToMutator_set_value_1_0
 
 The operation is not available in 3.0, the version in which it becomes
@@ -2904,7 +2904,7 @@
     >>> request_30 = request_for('3.0')
     >>> entry = getMultiAdapter((context, request_30), IEntry)
     >>> entry.field = 'foo'
-    >>> print entry.field
+    >>> print(entry.field)
     !foo!
 
 You can immediately reinstate a mutator operation as a named operation
@@ -2952,15 +2952,15 @@
 The mutator is accessible for version 1.0, as you'd expect.
 
     >>> context = MutatorPlusNamedOperation()
-    >>> print operation_for(context, '1.0', 'set_value').__class__.__name__
+    >>> print(operation_for(context, '1.0', 'set_value').__class__.__name__)
     POST_IMutatorPlusNamedOperationEntry_set_value_1_0
 
 The named operations that replace the mutator in versions 2.0 and 3.0 are
 also accessible.
 
-    >>> print operation_for(context, '2.0', 'set_value').__class__.__name__
+    >>> print(operation_for(context, '2.0', 'set_value').__class__.__name__)
     POST_IMutatorPlusNamedOperationEntry_set_value_2_0
-    >>> print operation_for(context, '3.0', 'set_value').__class__.__name__
+    >>> print(operation_for(context, '3.0', 'set_value').__class__.__name__)
     POST_IMutatorPlusNamedOperationEntry_set_value_3_0
 
 So, in the version that gets rid of named operations for mutator methods,

=== modified file 'src/lazr/restful/docs/webservice-error.rst'
--- src/lazr/restful/docs/webservice-error.rst	2019-11-04 09:54:43 +0000
+++ src/lazr/restful/docs/webservice-error.rst	2020-02-04 11:56:15 +0000
@@ -81,19 +81,19 @@
 When the request contains an OOPSID, it will be set in the X-Lazr-OopsId
 header:
 
-    >>> print request.response.headers.get('X-Lazr-OopsId')
+    >>> print(request.response.headers.get('X-Lazr-OopsId'))
     None
     >>> request = FakeRequest()
     >>> request.oopsid = 'OOPS-001'
     >>> ignored = render_error_view(InvalidInput('bad email'), request)
-    >>> print request.response.headers['X-Lazr-OopsId']
+    >>> print(request.response.headers['X-Lazr-OopsId'])
     OOPS-001
 
 Even if show_tracebacks is set to true, non-5xx error codes will not
 produce a traceback.
 
     >>> webservice_configuration.show_tracebacks = True
-    >>> print render_error_view(InvalidInput('bad email'), request)
+    >>> print(render_error_view(InvalidInput('bad email'), request))
     bad email
 
 
@@ -111,7 +111,7 @@
 so there's no point in hiding the exception message.  When tracebacks are
 shown, the view puts a traceback dump in the response.
 
-    >>> print render_error_view(ServerError('DB crash'), request)
+    >>> print(render_error_view(ServerError('DB crash'), request))
     DB crash
     <BLANKLINE>
     Traceback (most recent call last):
@@ -122,7 +122,7 @@
 will see the exception class name instead of a message.
 
     >>> webservice_configuration.show_tracebacks = False
-    >>> print render_error_view(ServerError('DB crash'), request)
+    >>> print(render_error_view(ServerError('DB crash'), request))
     ServerError
 
 

=== modified file 'src/lazr/restful/docs/webservice-marshallers.rst'
--- src/lazr/restful/docs/webservice-marshallers.rst	2019-11-04 09:54:43 +0000
+++ src/lazr/restful/docs/webservice-marshallers.rst	2020-02-04 11:56:15 +0000
@@ -60,7 +60,7 @@
     u'unicode\u2122'
     >>> marshaller.marshall_from_json_data("")
     ''
-    >>> print marshaller.marshall_from_json_data(None)
+    >>> print(marshaller.marshall_from_json_data(None))
     None
 
 marshall_from_request()
@@ -73,7 +73,7 @@
 SimpleFieldMarshaller tries first to parse the value as a JSON-encoded
 string, the resulting value is passed on to marshall_from_json_data().
 
-    >>> print marshaller.marshall_from_request("null")
+    >>> print(marshaller.marshall_from_request("null"))
     None
     >>> marshaller.marshall_from_request("true")
     True
@@ -121,9 +121,9 @@
 the SimpleFieldMarshaller implementation, the value is returned
 unchanged.
 
-    >>> print marshaller.unmarshall(None, 'foo')
+    >>> print(marshaller.unmarshall(None, 'foo'))
     foo
-    >>> print marshaller.unmarshall(None, None)
+    >>> print(marshaller.unmarshall(None, None))
     None
 
 When a more detailed representation is needed, unmarshall_to_closeup()
@@ -172,7 +172,7 @@
 
 None is passed through though.
 
-    >>> print marshaller.marshall_from_json_data(None)
+    >>> print(marshaller.marshall_from_json_data(None))
     None
 
 Booleans are encoded using the standard JSON representation of 'true' or
@@ -209,7 +209,7 @@
 
 None is passed through though.
 
-    >>> print marshaller.marshall_from_json_data(None)
+    >>> print(marshaller.marshall_from_json_data(None))
     None
 
 Integers are encoded using strings when in a request.
@@ -268,7 +268,7 @@
 
 None is passed through though.
 
-    >>> print marshaller.marshall_from_json_data(None)
+    >>> print(marshaller.marshall_from_json_data(None))
     None
 
 And integers are automatically converted to a float.
@@ -392,7 +392,7 @@
 
 None is passed through though.
 
-    >>> print marshaller.marshall_from_json_data(None)
+    >>> print(marshaller.marshall_from_json_data(None))
     None
 
 When coming from the request, everything is interpreted as a unicode
@@ -409,7 +409,7 @@
 
 Except that 'null' still returns None.
 
-    >>> print marshaller.marshall_from_request('null')
+    >>> print(marshaller.marshall_from_request('null'))
     None
 
 Bytes
@@ -436,7 +436,7 @@
 
 Again, except for None which is passed through.
 
-    >>> print marshaller.marshall_from_json_data(None)
+    >>> print(marshaller.marshall_from_json_data(None))
     None
 
 When coming over the request, the value is also converted into a UTF-8
@@ -451,7 +451,7 @@
 
 But again, None is returned as is.
 
-    >>> print marshaller.marshall_from_request('null')
+    >>> print(marshaller.marshall_from_request('null'))
     None
 
 Since multipart/form-data can be used to upload data, file-like objects
@@ -511,7 +511,7 @@
 
 None is passed through.
 
-    >>> print marshaller.marshall_from_json_data(None)
+    >>> print(marshaller.marshall_from_json_data(None))
     None
 
 When coming from the request, everything is interpreted as a unicode
@@ -532,7 +532,7 @@
 
 But again, 'null' is returned as None.
 
-    >>> print marshaller.marshall_from_request('null')
+    >>> print(marshaller.marshall_from_request('null'))
     None
 
 Unlike a Bytes field, an ASCIILine field used in an entry is stored
@@ -581,7 +581,7 @@
 
 None is always returned unchanged.
 
-    >>> print marshaller.marshall_from_json_data(None)
+    >>> print(marshaller.marshall_from_json_data(None))
     None
 
 Since this marshaller's Choice fields deal with small, fixed
@@ -589,7 +589,7 @@
 describe the vocabulary as a whole.
 
     >>> for token in marshaller.unmarshall_to_closeup(None, '10'):
-    ...     print sorted(token.items())
+    ...     print(sorted(token.items()))
     [('title', None), ('token', '10')]
     [('title', None), ('token', 'a value')]
     [('title', None), ('token', 'True')]
@@ -597,7 +597,7 @@
 And None is handled correctly.
 
     >>> for token in marshaller.unmarshall_to_closeup(None, None):
-    ...     print sorted(token.items())
+    ...     print(sorted(token.items()))
     [('title', None), ('token', '10')]
     [('title', None), ('token', 'a value')]
     [('title', None), ('token', 'True')]
@@ -613,7 +613,7 @@
     ...     try:
     ...         callable(*args)
     ...     except ValueError as e:
-    ...         print 'ValueError:', unicode(e)
+    ...         print('ValueError:', unicode(e))
 
 
 Choice of EnumeratedTypes
@@ -641,7 +641,7 @@
 
 None is returned unchanged:
 
-    >>> print marshaller.marshall_from_json_data(None)
+    >>> print(marshaller.marshall_from_json_data(None))
     None
 
 This marshaller is for a Choice field describing a small, fixed
@@ -651,7 +651,7 @@
 
     >>> for cuisine in sorted(
     ...     marshaller.unmarshall_to_closeup(None, "Triaged")):
-    ...     print sorted(cuisine.items())
+    ...     print(sorted(cuisine.items()))
     [('title', 'American'), ('token', 'AMERICAN')]
     ...
     [('title', 'Vegetarian'), ('token', 'VEGETARIAN')]
@@ -673,7 +673,7 @@
     >>> from lazr.restful.example.base.root import COOKBOOKS
     >>> cookbook = COOKBOOKS[0]
     >>> cookbook_url = reference_marshaller.unmarshall(None, cookbook)
-    >>> print cookbook_url
+    >>> print(cookbook_url)
     http://.../cookbooks/Mastering%20the%20Art%20of%20French%20Cooking
 
 A URL is unmarshalled to the underlying object.
@@ -692,7 +692,7 @@
     ...
     ValueError: got 'int', expected string: 4
 
-    >>> print reference_marshaller.marshall_from_json_data(None)
+    >>> print(reference_marshaller.marshall_from_json_data(None))
     None
 
 Relative URLs
@@ -702,7 +702,7 @@
 
     >>> cookbook = reference_marshaller.marshall_from_json_data(
     ...     '/cookbooks/Everyday%20Greens')
-    >>> print cookbook.name
+    >>> print(cookbook.name)
     Everyday Greens
 
 Collections
@@ -817,10 +817,10 @@
 
 None is passed through though.
 
-    >>> print list_marshaller.marshall_from_json_data(None)
+    >>> print(list_marshaller.marshall_from_json_data(None))
     None
 
-    >>> print dict_marshaller.marshall_from_json_data(None)
+    >>> print(dict_marshaller.marshall_from_json_data(None))
     None
 
 ValueError is also raised if one of the value in the list doesn't
@@ -892,10 +892,10 @@
 
 Except that 'null' still returns None.
 
-    >>> print list_marshaller.marshall_from_request('null')
+    >>> print(list_marshaller.marshall_from_request('null'))
     None
 
-    >>> print dict_marshaller.marshall_from_request('null')
+    >>> print(dict_marshaller.marshall_from_request('null'))
     None
 
 Also, as a convenience for web client, so that they don't have to JSON
@@ -920,7 +920,7 @@
 
 The unmarshall() method will return None when given None.
 
-    >>> print dict_marshaller.unmarshall(None, None)
+    >>> print(dict_marshaller.unmarshall(None, None))
     None
 
 CollectionField

=== modified file 'src/lazr/restful/docs/webservice-request.rst'
--- src/lazr/restful/docs/webservice-request.rst	2019-11-04 09:54:43 +0000
+++ src/lazr/restful/docs/webservice-request.rst	2020-02-04 11:56:15 +0000
@@ -67,7 +67,7 @@
     >>> cache.objects['object1'] = 'foo'
     >>> cache.objects['object2'] = 'bar'
     >>> for key in sorted(cache.objects):
-    ...     print "%s: %s" % (key, cache.objects[key])
+    ...     print("%s: %s" % (key, cache.objects[key]))
     object1: foo
     object2: bar
 
@@ -77,7 +77,7 @@
     >>> cache.links['objectA'] = 'foo'
     >>> cache.links['objectB'] = 'bar'
     >>> for key in sorted(cache.links):
-    ...     print "%s: %s" % (key, cache.links[key])
+    ...     print("%s: %s" % (key, cache.links[key]))
     objectA: foo
     objectB: bar
 
@@ -95,6 +95,6 @@
     >>> cache = test_tales(
     ...     "request/webservicerequest:cache", request=website_request)
     >>> for key in sorted(cache.links):
-    ...     print "%s: %s" % (key, cache.links[key])
+    ...     print("%s: %s" % (key, cache.links[key]))
     objectA: foo
     objectB: bar

=== modified file 'src/lazr/restful/docs/webservice.rst'
--- src/lazr/restful/docs/webservice.rst	2019-11-04 09:54:43 +0000
+++ src/lazr/restful/docs/webservice.rst	2020-02-04 11:56:15 +0000
@@ -862,7 +862,7 @@
     >>> from lazr.restful._resource import get_entry_fields_in_write_order
     >>> def print_fields_in_write_order(entry):
     ...     for name, field in get_entry_fields_in_write_order(entry):
-    ...         print name
+    ...         print(name)
 
     >>> print_fields_in_write_order(author_entry)
     name
@@ -1123,7 +1123,7 @@
     >>> wadl_request = create_web_service_request(
     ...     '/beta/', environ=wadl_headers)
     >>> wadl_resource = wadl_request.traverse(app)
-    >>> print wadl_resource(wadl_request)
+    >>> print(wadl_resource(wadl_request))
     <?xml version="1.0"?>
     <!DOCTYPE...
     <wadl:application ...>
@@ -1139,7 +1139,7 @@
 so there's an ``AssertionError``.
 
     >>> sm.registerAdapter(DishCollection, [IAuthorSet], ICollection)
-    >>> print wadl_resource(wadl_request)
+    >>> print(wadl_resource(wadl_request))
     Traceback (most recent call last):
     ...
     AssertionError: There must be one (and only one) adapter
@@ -1249,7 +1249,7 @@
     ...    environ={'QUERY_STRING' :
     ...             'ws.op=find_recipes&name=NoSuchRecipe'})
     >>> operation_resource = request.traverse(app)
-    >>> print operation_resource()
+    >>> print(operation_resource())
     No matches for NoSuchRecipe
 
 Collections may also support named POST operations. These requests
@@ -1260,7 +1260,7 @@
 
     >>> def modified_cookbook(object, event):
     ...     """Print a message when triggered."""
-    ...     print "You just modified a cookbook."
+    ...     print("You just modified a cookbook.")
 
     >>> from lazr.lifecycle.interfaces import IObjectModifiedEvent
     >>> from lazr.restful.testing.event import TestEventListener
@@ -1269,7 +1269,7 @@
 
     >>> def modified_cookbook_set(object, event):
     ...     """Print a message when triggered."""
-    ...     print "You just modified the cookbook set."
+    ...     print("You just modified the cookbook set.")
 
 Here we create a new cookbook for an existing author. Because the
 operation's definition doesn't set send_modified_event to True, no
@@ -1506,11 +1506,11 @@
 expect.
 
     >>> request, operation = make_dummy_operation_request("A string.")
-    >>> print operation()
+    >>> print(operation())
     "A string."
     >>> request.response.getStatus()
     200
-    >>> print request.response.getHeader('Content-Type')
+    >>> print(request.response.getHeader('Content-Type'))
     application/json
 
     >>> request, operation = make_dummy_operation_request(True)
@@ -1579,7 +1579,7 @@
     >>> request, operation = make_dummy_operation_request(recipes)
     >>> response = operation()
     >>> for key, value in sorted(simplejson.loads(response).items()):
-    ...     print '%s: %s' % (key, value)
+    ...     print('%s: %s' % (key, value))
     entries: [{...}, {...}]
     start: ...
     total_size: 2
@@ -1591,7 +1591,7 @@
     >>> request, operation = make_dummy_operation_request(DishSet())
     >>> response = operation()
     >>> for key, value in sorted(simplejson.loads(response).items()):
-    ...     print '%s: %s' % (key, value)
+    ...     print('%s: %s' % (key, value))
     entries: ...
     start: ...
     total_size: ...
@@ -1661,13 +1661,13 @@
     ...     return dict(entity_body=entity_body,
     ...                 response=get_request.response)
 
-    >>> print get_julia(etag_original)['response'].getStatus()
+    >>> print(get_julia(etag_original)['response'].getStatus())
     304
 
 If the ETags don't match, the server assumes the client has an old
 representation, and sends the new representation.
 
-    >>> print get_julia('bad etag')['entity_body']
+    >>> print(get_julia('bad etag')['entity_body'])
     {...}
 
 Change the state of the resource, and the ETag changes.
@@ -1706,27 +1706,27 @@
 Under normal circumstances, lazr.restful won't recognize an ETag
 modified by mod_compress.
 
-    >>> print get_julia(modified_etag_1)['entity_body']
+    >>> print(get_julia(modified_etag_1)['entity_body'])
     {...}
 
 When 'compensate_for_mod_compress_etag_modification' is set,
 lazr.restful will recognize an ETag modified by mod_compress.
 
     >>> c = webservice_configuration
-    >>> print c.compensate_for_mod_compress_etag_modification
+    >>> print(c.compensate_for_mod_compress_etag_modification)
     False
     >>> c.compensate_for_mod_compress_etag_modification = True
 
-    >>> print get_julia(modified_etag_1)['response'].getStatus()
+    >>> print(get_julia(modified_etag_1)['response'].getStatus())
     304
 
-    >>> print get_julia(modified_etag_2)['response'].getStatus()
+    >>> print(get_julia(modified_etag_2)['response'].getStatus())
     304
 
 Of course, that doesn't mean lazr.restful will recognize any random
 ETag.
 
-    >>> print get_julia(etag + "-not-gzip")['entity_body']
+    >>> print(get_julia(etag + "-not-gzip")['entity_body'])
     {...}
 
 Cleanup.
@@ -1831,10 +1831,10 @@
     >>> body = simplejson.dumps(author)
     >>> put_request = create_web_service_request(
     ...     beard_url, body=body, environ=headers, method='PUT')
-    >>> print put_request.traverse(app)()
+    >>> print(put_request.traverse(app)())
     (<Recipe object...>, 'dish', ...)
 
-    >>> print put_request.response.getStatus()
+    >>> print(put_request.response.getStatus())
     401
 
 Stored file resources
@@ -1863,7 +1863,7 @@
     ...
     NotFound: ... name: 'cover'
 
-    >>> print C2.cover
+    >>> print(C2.cover)
     None
 
 A cookbook can be given a cover with PUT.
@@ -1885,7 +1885,7 @@
     >>> file_resource()
     >>> get_request.response.getStatus()
     303
-    >>> print get_request.response.getHeader('Location')
+    >>> print(get_request.response.getHeader('Location'))
     http://cookbooks.dev/.../filemanager/0
 
 The cover can be deleted with DELETE.
@@ -1902,7 +1902,7 @@
     ...
     NotFound: ... name: 'cover'
 
-    >>> print C2.cover
+    >>> print(C2.cover)
     None
 
 Field resources
@@ -1912,7 +1912,7 @@
 
     >>> field_resource = create_web_service_request(
     ...     '/beta/cookbooks/The%20Joy%20of%20Cooking/name').traverse(app)
-    >>> print field_resource()
+    >>> print(field_resource())
     "The Joy of Cooking"
 
 Requesting non available resources
@@ -2050,39 +2050,39 @@
 matches the hostname you're requesting. If they don't match, your
 request will fail.
 
-    >>> print change_joy_author(u'http://not.the.same.host' + path)
+    >>> print(change_joy_author(u'http://not.the.same.host' + path))
     author_link: No such object...
 
 One possible source of hostname mismatches is the HTTP port. If the
 web service is served from a strange port, you'll need to specify that
 port in the URLs you send.
 
-    >>> print change_joy_author(u'http://api.cookbooks.dev' + path,
-    ...                         host='api.cookbooks.dev:9000')
+    >>> print(change_joy_author(u'http://api.cookbooks.dev' + path,
+    ...                         host='api.cookbooks.dev:9000'))
     author_link: No such object...
 
-    >>> print change_joy_author(u'http://api.cookbooks.dev:9000' + path,
-    ...                         host='api.cookbooks.dev:9000')
+    >>> print(change_joy_author(u'http://api.cookbooks.dev:9000' + path,
+    ...                         host='api.cookbooks.dev:9000'))
     {...}
 
 You don't have to specify the default port in the URLs you send, even
 if you specified it when you made the request.
 
-    >>> print change_joy_author(u'http://api.cookbooks.dev' + path,
-    ...                         host='api.cookbooks.dev:80')
-    {...}
-
-    >>> print change_joy_author(u'http://api.cookbooks.dev:80' + path,
-    ...                         host='api.cookbooks.dev')
-    {...}
-
-    >>> print change_joy_author(u'https://api.cookbooks.dev' + path,
-    ...                         host='api.cookbooks.dev:443')
+    >>> print(change_joy_author(u'http://api.cookbooks.dev' + path,
+    ...                         host='api.cookbooks.dev:80'))
+    {...}
+
+    >>> print(change_joy_author(u'http://api.cookbooks.dev:80' + path,
+    ...                         host='api.cookbooks.dev'))
+    {...}
+
+    >>> print(change_joy_author(u'https://api.cookbooks.dev' + path,
+    ...                         host='api.cookbooks.dev:443'))
     author_link: No such object...
 
     >>> webservice_configuration.use_https = True
-    >>> print change_joy_author(u'https://api.cookbooks.dev' + path,
-    ...                         host='api.cookbooks.dev:443')
+    >>> print(change_joy_author(u'https://api.cookbooks.dev' + path,
+    ...                         host='api.cookbooks.dev:443'))
     {...}
     >>> webservice_configuration.use_https = False
 
@@ -2098,7 +2098,7 @@
 
     >>> resource = create_web_service_request(
     ...     recipe_url, method='GET').traverse(app)
-    >>> print resource()
+    >>> print(resource())
     {...}
 
     >>> resource = create_web_service_request(

=== modified file 'src/lazr/restful/error.py'
--- src/lazr/restful/error.py	2016-02-17 01:07:21 +0000
+++ src/lazr/restful/error.py	2020-02-04 11:56:15 +0000
@@ -2,6 +2,8 @@
 
 """Error handling on the webservice."""
 
+from __future__ import absolute_import, print_function
+
 __metaclass__ = type
 __all__ = [
     'ClientErrorView',

=== modified file 'src/lazr/restful/example/base/filemanager.py'
--- src/lazr/restful/example/base/filemanager.py	2016-02-17 01:07:21 +0000
+++ src/lazr/restful/example/base/filemanager.py	2020-02-04 11:56:15 +0000
@@ -2,6 +2,8 @@
 
 """The file manager for the LAZR example web service."""
 
+from __future__ import absolute_import, print_function
+
 __metaclass__ = type
 __all__ = ['FileManager',
            'ManagedFileResource']

=== modified file 'src/lazr/restful/example/base/interfaces.py'
--- src/lazr/restful/example/base/interfaces.py	2018-09-28 15:42:18 +0000
+++ src/lazr/restful/example/base/interfaces.py	2020-02-04 11:56:15 +0000
@@ -3,6 +3,8 @@
 
 """Interface objects for the LAZR example web service."""
 
+from __future__ import absolute_import, print_function
+
 __metaclass__ = type
 __all__ = ['AlreadyNew',
            'Cuisine',

=== modified file 'src/lazr/restful/example/base/root.py'
--- src/lazr/restful/example/base/root.py	2016-02-17 01:07:21 +0000
+++ src/lazr/restful/example/base/root.py	2020-02-04 11:56:15 +0000
@@ -2,6 +2,8 @@
 
 """Data model objects for the LAZR example web service."""
 
+from __future__ import absolute_import, print_function
+
 __metaclass__ = type
 __all__ = ['Cookbook',
            'CookbookServiceRootResource',

=== modified file 'src/lazr/restful/example/base/security.py'
--- src/lazr/restful/example/base/security.py	2015-04-08 20:11:29 +0000
+++ src/lazr/restful/example/base/security.py	2020-02-04 11:56:15 +0000
@@ -2,6 +2,8 @@
 
 """A simple security policy for the LAZR example web service."""
 
+from __future__ import absolute_import, print_function
+
 __metaclass__ = type
 __all__ = [
     'CookbookWebServiceSecurityPolicy',

=== modified file 'src/lazr/restful/example/base/subscribers.py'
--- src/lazr/restful/example/base/subscribers.py	2015-04-08 20:11:29 +0000
+++ src/lazr/restful/example/base/subscribers.py	2020-02-04 11:56:15 +0000
@@ -2,6 +2,8 @@
 
 """Event listeners for the example web service."""
 
+from __future__ import absolute_import, print_function
+
 __metaclass__ = type
 __all__ = ['update_cookbook_revision_number']
 

=== modified file 'src/lazr/restful/example/base/tests/collection.txt'
--- src/lazr/restful/example/base/tests/collection.txt	2019-10-30 11:03:09 +0000
+++ src/lazr/restful/example/base/tests/collection.txt	2020-02-04 11:56:15 +0000
@@ -40,7 +40,7 @@
 
 There are no XHTML representations available for collections.
 
-    >>> print webservice.get('/cookbooks', 'application/xhtml+xml')
+    >>> print(webservice.get('/cookbooks', 'application/xhtml+xml'))
     HTTP/1.1 200 Ok
     ...
     Content-Type: application/json
@@ -76,7 +76,7 @@
 But requesting a batch size higher than the maximum configured value
 results in a 400 error.
 
-      >>> print webservice.get("/cookbooks?ws.start=0&ws.size=1000")
+      >>> print(webservice.get("/cookbooks?ws.start=0&ws.size=1000"))
       HTTP/1.1 400 Bad Request
       ...
       Content-Type: text/plain...
@@ -144,15 +144,15 @@
 
     >>> url = quote("/dishes/Roast chicken/recipes")
     >>> result = webservice.get(url).jsonBody()
-    >>> print result['resource_type_link']
+    >>> print(result['resource_type_link'])
     http://...#recipe-page-resource
     >>> cookbooks_with_recipe = sorted(
     ...     [r['cookbook_link'] for r in result['entries']])
     >>> len(cookbooks_with_recipe)
     3
-    >>> print cookbooks_with_recipe[0]
+    >>> print(cookbooks_with_recipe[0])
     http://.../cookbooks/James%20Beard%27s%20American%20Cookery
-    >>> print cookbooks_with_recipe[-1]
+    >>> print(cookbooks_with_recipe[-1])
     http://.../cookbooks/The%20Joy%20of%20Cooking
 
 ================
@@ -201,13 +201,13 @@
 When an operation yields a collection of objects, the representation
 includes a link that yields the total size of the collection.
 
-    >>> print s_recipes['total_size_link']
+    >>> print(s_recipes['total_size_link'])
     http://.../cookbooks?search=chicken&vegetarian=false&ws.op=find_recipes&ws.show=total_size
 
 Sending a GET request to that link yields a JSON representation of the
 total size.
 
-   >>> print webservice.get(s_recipes['total_size_link']).jsonBody()
+   >>> print(webservice.get(s_recipes['total_size_link']).jsonBody())
    3
 
 If the entire collection fits in a single 'page' of results, the
@@ -239,7 +239,7 @@
 Custom operations may have error handling. In this case, the error
 handling is in the validate() method of the 'search' field.
 
-    >>> print webservice.get("/cookbooks?ws.op=find_recipes")
+    >>> print(webservice.get("/cookbooks?ws.op=find_recipes"))
     HTTP/1.1 400 Bad Request
     ...
     search: Required input is missing.
@@ -249,7 +249,7 @@
     >>> from lazr.restful.testing.helpers import encode_response
     >>> url = u"/cookbooks?ws.op=find_for_cuisine&cuisine=%E2%98%83"
     >>> response = webservice.get(url.encode("utf-8"))
-    >>> print encode_response(response)
+    >>> print(encode_response(response))
     HTTP/1.1 400 Bad Request
     ...
     cuisine: Invalid value "\u2603". Acceptable values are:...
@@ -261,7 +261,7 @@
 
     >>> general_cookbooks = webservice.get(
     ...     "/cookbooks?ws.op=find_for_cuisine&cuisine=General")
-    >>> print general_cookbooks.jsonBody()['total_size']
+    >>> print(general_cookbooks.jsonBody()['total_size'])
     3
 
 POST operations
@@ -279,18 +279,18 @@
     ...         name=name, cuisine=cuisine,
     ...         copyright_date=date, last_printing=date, price=price)
 
-    >>> print webservice.get(quote('/cookbooks/The Cake Bible'))
+    >>> print(webservice.get(quote('/cookbooks/The Cake Bible')))
     HTTP/1.1 404 Not Found
     ...
 
     >>> from datetime import date
-    >>> print create_cookbook("The Cake Bible", "Dessert", date(1988, 1, 1))
+    >>> print(create_cookbook("The Cake Bible", "Dessert", date(1988, 1, 1)))
     HTTP/1.1 201 Created
     ...
     Location: http://.../cookbooks/The%20Cake%20Bible
     ...
 
-    >>> print webservice.get("/cookbooks/The%20Cake%20Bible")
+    >>> print(webservice.get("/cookbooks/The%20Cake%20Bible"))
     HTTP/1.1 200 Ok
     ...
 
@@ -298,21 +298,21 @@
 create a cookbook with a name that's already in use. This exception is
 raised by the create() method itself.
 
-    >>> print create_cookbook("The Cake Bible", "Dessert", date(1988, 1, 1))
+    >>> print(create_cookbook("The Cake Bible", "Dessert", date(1988, 1, 1)))
     HTTP/1.1 409 Conflict
     ...
     A cookbook called "The Cake Bible" already exists.
 
 A POST request has no meaning unless it specifies a custom operation.
 
-    >>> print webservice.post("/cookbooks", 'text/plain', '')
+    >>> print(webservice.post("/cookbooks", 'text/plain', ''))
     HTTP/1.1 400 Bad Request
     ...
     No operation name given.
 
 You can't invoke a nonexistent operation:
 
-    >>> print webservice.named_post("/cookbooks", "nosuchop", {})
+    >>> print(webservice.named_post("/cookbooks", "nosuchop", {}))
     HTTP/1.1 400 Bad Request
     ...
     No such operation: nosuchop

=== modified file 'src/lazr/restful/example/base/tests/entry.txt'
--- src/lazr/restful/example/base/tests/entry.txt	2018-09-28 15:46:34 +0000
+++ src/lazr/restful/example/base/tests/entry.txt	2020-02-04 11:56:15 +0000
@@ -108,7 +108,7 @@
 Every entry has an XHTML representation. The default representation is
 a simple definition list.
 
-    >>> print webservice.get(greens_url, 'application/xhtml+xml')
+    >>> print(webservice.get(greens_url, 'application/xhtml+xml'))
     HTTP/1.1 200 Ok
     ...
     <dl ...>
@@ -118,7 +118,7 @@
 Getting the XHTML representation works correctly even when some of the fields
 have non-ascii values.
 
-    >>> print webservice.get(construsions_url, 'application/xhtml+xml')
+    >>> print(webservice.get(construsions_url, 'application/xhtml+xml'))
     HTTP/1.1 200 Ok
     ...
     <dl ...>
@@ -158,7 +158,7 @@
 ...and the XHTML representation of an ICookbook will be the result of
 calling a DummyView object.
 
-    >>> print webservice.get(greens_url, 'application/xhtml+xml')
+    >>> print(webservice.get(greens_url, 'application/xhtml+xml'))
     HTTP/1.1 200 Ok
     ...
     <html>foo</html>
@@ -172,7 +172,7 @@
     ...      required=[ICookbook, IWebServiceClientRequest],
     ...      provided=IInterface, name=view_name)
 
-    >>> print webservice.get(greens_url, 'application/xhtml+xml')
+    >>> print(webservice.get(greens_url, 'application/xhtml+xml'))
     HTTP/1.1 200 Ok
     ...
     <dl ...>
@@ -185,11 +185,11 @@
 There are two recipes in "James Beard's American Cookery", but one of
 them has been marked private. The private one cannot be retrieved.
 
-    >>> print webservice.get('/recipes/3')
+    >>> print(webservice.get('/recipes/3'))
     HTTP/1.1 200 Ok
     ...
 
-    >>> print webservice.get('/recipes/5')
+    >>> print(webservice.get('/recipes/5'))
     HTTP/1.1 401 Unauthorized
     ...
 
@@ -199,9 +199,9 @@
 value for the 'confirmed' field is not visible.
 
     >>> cookbook = webservice.get(greens_url).jsonBody()
-    >>> print cookbook['name']
+    >>> print(cookbook['name'])
     Everyday Greens
-    >>> print cookbook['confirmed']
+    >>> print(cookbook['confirmed'])
     tag:launchpad.net:2008:redacted
 
 Named operations
@@ -235,7 +235,7 @@
 may be relative to the versioned service root. This is for developer
 convenience only, as lazr.restful never serves relative URLs.
 
-    >>> print dish_url
+    >>> print(dish_url)
     http://cookbooks.dev/devel/dishes/Roast%20chicken
     >>> relative_url = quote("/dishes/Roast chicken")
     >>> find_recipe_in_joy(relative_url)['instructions']
@@ -255,22 +255,22 @@
 interesting. As a result of the operation, the cookbook's location will
 change so we get a 301 response with the new URL.
 
-    >>> print webservice.get(joy_url).jsonBody()['cuisine']
+    >>> print(webservice.get(joy_url).jsonBody()['cuisine'])
     General
 
-    >>> print webservice.named_post(joy_url, 'make_more_interesting', {})
+    >>> print(webservice.named_post(joy_url, 'make_more_interesting', {}))
     HTTP/1.1 301 Moved Permanently
     ...
     Location: http://cookbooks.dev/devel/cookbooks/The%20New%20The%20Joy%20of%20Cooking
     ...
 
     >>> new_joy_url = quote("/cookbooks/The New The Joy of Cooking")
-    >>> print webservice.get(new_joy_url).jsonBody()['name']
+    >>> print(webservice.get(new_joy_url).jsonBody()['name'])
     The New The Joy of Cooking
 
 Custom operations may have error handling.
 
-    >>> print webservice.named_post(new_joy_url, 'make_more_interesting', {})
+    >>> print(webservice.named_post(new_joy_url, 'make_more_interesting', {}))
     HTTP/1.1 400 Bad Request
     ...
     The 'New' trick can't be used on this cookbook because its
@@ -283,7 +283,7 @@
 
 Trying to invoke a nonexistent custom operation yields an error.
 
-    >>> print webservice.get("%s?ws.op=no_such_operation" % joy_url)
+    >>> print(webservice.get("%s?ws.op=no_such_operation" % joy_url))
     HTTP/1.1 400 Bad Request
     ...
     No such operation: no_such_operation
@@ -316,12 +316,12 @@
 Greens" cookbook. The data returned is the new JSON representation of
 the object.
 
-    >>> print webservice.get(greens_url).jsonBody()['revision_number']
+    >>> print(webservice.get(greens_url).jsonBody()['revision_number'])
     0
 
     >>> result = modify_cookbook('Everyday Greens', {'cuisine' : 'American'},
     ...                          'PATCH')
-    >>> print result
+    >>> print(result)
     HTTP/1.1 209 Content Returned
     ...
     Content-Type: application/json
@@ -329,13 +329,13 @@
     {...}
 
     >>> greens = result.jsonBody()
-    >>> print greens['cuisine']
+    >>> print(greens['cuisine'])
     American
 
 Whenever a client modifies a cookbook, the revision_number is
 incremented behind the scenes.
 
-    >>> print greens['revision_number']
+    >>> print(greens['revision_number'])
     1
 
 A modification may cause one of en entry's links to point to another
@@ -343,16 +343,16 @@
 recipe, turning it into a recipe for baked beans.
 
     >>> old_dish = webservice.get("/recipes/1").jsonBody()['dish_link']
-    >>> print old_dish
+    >>> print(old_dish)
     http://.../dishes/Roast%20chicken
 
     >>> new_dish = webservice.get("/recipes/4").jsonBody()['dish_link']
-    >>> print new_dish
+    >>> print(new_dish)
     http://.../dishes/Baked%20beans
 
     >>> new_entry = modify_entry(
     ...     "/recipes/2", {'dish_link' : new_dish}, 'PATCH').jsonBody()
-    >>> print new_entry['dish_link']
+    >>> print(new_entry['dish_link'])
     http://.../dishes/Baked%20beans
 
 When changing one of an entry's links, you can use an absolute URL (as
@@ -364,14 +364,14 @@
     >>> new_entry = modify_entry(
     ...     "/recipes/2", {'dish_link' : relative_old_dish},
     ...     'PATCH').jsonBody()
-    >>> print new_entry['dish_link']
+    >>> print(new_entry['dish_link'])
     http://.../dishes/Roast%20chicken
 
 A modification might cause an entry's address to change. Here we use
 the web service to change the cookbook's name to 'Everyday Greens 2'.
 
-    >>> print modify_cookbook('Everyday Greens',
-    ...                       {'name' : 'Everyday Greens 2'}, 'PATCH')
+    >>> print(modify_cookbook('Everyday Greens',
+    ...                       {'name' : 'Everyday Greens 2'}, 'PATCH'))
     HTTP/1.1 301 Moved Permanently
     ...
     Location: http://.../Everyday%20Greens%202
@@ -384,8 +384,8 @@
 the cookbook name back, we need to send a PATCH request to the new
 address.
 
-    >>> print modify_cookbook('Everyday Greens 2',
-    ...                       {'name' : 'Everyday Greens'}, 'PATCH')
+    >>> print(modify_cookbook('Everyday Greens 2',
+    ...                       {'name' : 'Everyday Greens'}, 'PATCH'))
     HTTP/1.1 301 Moved Permanently
     ...
     Location: http://.../cookbooks/Everyday%20Greens
@@ -398,19 +398,19 @@
 also set the X-Content-Type-Override header, which will override the
 value of Content-Type.
 
-    >>> print modify_cookbook('Everyday Greens',
+    >>> print(modify_cookbook('Everyday Greens',
     ...     {'cuisine' : 'General'}, 'POST',
     ...     {'X-HTTP-Method-Override' : 'PATCH',
     ...      'Content-Type': 'not-a-valid-content/type',
-    ...      'X-Content-Type-Override': 'application/json'})
+    ...      'X-Content-Type-Override': 'application/json'}))
     HTTP/1.1 209 Content Returned
     ...
 
 Here, the use of a nonexistent HTTP method causes an error.
 
-    >>> print modify_cookbook('Everyday Greens',
+    >>> print(modify_cookbook('Everyday Greens',
     ...     {'cuisine' : 'General'}, 'POST',
-    ...     {'X-HTTP-Method-Override' : 'NOSUCHMETHOD'})
+    ...     {'X-HTTP-Method-Override' : 'NOSUCHMETHOD'}))
     HTTP/1.1 405 Method Not Allowed
     ...
 
@@ -419,8 +419,8 @@
 method, your value is ignored. Here, a nonexistent HTTP method is
 ignored in favor of HTTP GET.
 
-    >>> print webservice('/cookbooks/Everyday%20Greens', 'GET',
-    ...     headers={'X-HTTP-Method-Override' : 'NOSUCHMETHOD'})
+    >>> print(webservice('/cookbooks/Everyday%20Greens', 'GET',
+    ...     headers={'X-HTTP-Method-Override' : 'NOSUCHMETHOD'}))
     HTTP/1.1 200 Ok
     ...
     Content-Type: application/json
@@ -437,24 +437,24 @@
 the object that was modified.
 
     >>> greens = webservice.get(greens_url).jsonBody()
-    >>> print greens['cuisine']
+    >>> print(greens['cuisine'])
     General
 
     >>> greens['cuisine'] = 'Vegetarian'
-    >>> print modify_cookbook('Everyday Greens', greens, 'PUT')
+    >>> print(modify_cookbook('Everyday Greens', greens, 'PUT'))
     HTTP/1.1 209 Content Returned
     ...
     {...}
 
     >>> greens = webservice.get(greens_url).jsonBody()
-    >>> print greens['cuisine']
+    >>> print(greens['cuisine'])
     Vegetarian
 
 Because our patch format is the same as our representation format (a
 JSON hash), any document that works with a PUT request will also work
 with a PATCH request.
 
-    >>> print modify_cookbook('Everyday Greens', greens, 'PATCH')
+    >>> print(modify_cookbook('Everyday Greens', greens, 'PATCH'))
     HTTP/1.1 209 Content Returned
     ...
 
@@ -464,8 +464,8 @@
 When making a PATCH, you don't have to get a JSON representation
 back. You can also get an HTML representation.
 
-    >>> print modify_cookbook('Everyday Greens', {}, 'PATCH',
-    ...                       headers={'Accept': 'application/xhtml+xml'})
+    >>> print(modify_cookbook('Everyday Greens', {}, 'PATCH',
+    ...                       headers={'Accept': 'application/xhtml+xml'}))
     HTTP/1.1 209 Content Returned
     ...
     Content-Type: application/xhtml+xml
@@ -476,8 +476,8 @@
 You can even get a WADL representation, though that's pretty useless.
 
     >>> headers = {'Accept':'application/vd.sun.wadl+xml'}
-    >>> print modify_cookbook('Everyday Greens', {}, 'PATCH',
-    ...                       headers=headers)
+    >>> print(modify_cookbook('Everyday Greens', {}, 'PATCH',
+    ...                       headers=headers))
     HTTP/1.1 209 Content Returned
     ...
     Content-Type: application/vd.sun.wadl+xml
@@ -556,8 +556,8 @@
 If-None-Match header. This lets you save time when the resource hasn't
 changed.
 
-    >>> print webservice.get(greens_url,
-    ...                      headers={'If-None-Match': greens_etag})
+    >>> print(webservice.get(greens_url,
+    ...                      headers={'If-None-Match': greens_etag}))
     HTTP/1.1 304 Not Modified
     ...
 
@@ -570,7 +570,7 @@
     >>> etag = 'dummy-etag'
     >>> response = ajax.get(greens_url, headers={'If-None-Match' : etag})
     >>> etag = response.getheader("Etag")
-    >>> print ajax.get(greens_url, headers={'If-None-Match' : etag})
+    >>> print(ajax.get(greens_url, headers={'If-None-Match' : etag}))
     HTTP/1.1 304 Not Modified
     ...
 
@@ -581,8 +581,8 @@
 If the ETag you provide in If-Match matches the entry's current ETag,
 your request goes through.
 
-    >>> print modify_cookbook('Everyday Greens', greens, 'PATCH',
-    ...                     {'If-Match' : greens_etag})
+    >>> print(modify_cookbook('Everyday Greens', greens, 'PATCH',
+    ...                     {'If-Match' : greens_etag}))
     HTTP/1.1 209 Content Returned
     ...
 
@@ -590,8 +590,8 @@
 after you got your copy of it. Your request will fail with status code
 412.
 
-    >>> print modify_cookbook('Everyday Greens', greens, 'PATCH',
-    ...                       {'If-Match' : '"an-old-etag"'})
+    >>> print(modify_cookbook('Everyday Greens', greens, 'PATCH',
+    ...                       {'If-Match' : '"an-old-etag"'}))
     HTTP/1.1 412 Precondition Failed
     ...
 
@@ -600,15 +600,15 @@
 
     >>> greens = webservice.get(greens_url).jsonBody()
     >>> match = '"an-old-etag", %s' % greens['http_etag']
-    >>> print modify_cookbook('Everyday Greens', greens, 'PATCH',
-    ...                       {'If-Match' : match})
+    >>> print(modify_cookbook('Everyday Greens', greens, 'PATCH',
+    ...                       {'If-Match' : match}))
     HTTP/1.1 209 Content Returned
     ...
 
 Both PUT and PATCH requests work this way.
 
-    >>> print modify_cookbook('Everyday Greens', greens, 'PUT',
-    ...                       {'If-Match' : 'an-old-etag'})
+    >>> print(modify_cookbook('Everyday Greens', greens, 'PUT',
+    ...                       {'If-Match' : 'an-old-etag'}))
     HTTP/1.1 412 Precondition Failed
     ...
 
@@ -623,7 +623,7 @@
 read-only field?
 
     >>> greens = webservice.get(greens_url).jsonBody()
-    >>> print greens['copyright_date']
+    >>> print(greens['copyright_date'])
     2003-01-01
     >>> etag_before_server_modification = greens['http_etag']
 
@@ -639,7 +639,7 @@
     >>> greens_object.copyright_date = datetime.date(2005, 12, 12)
 
     >>> new_greens = webservice.get(greens_url).jsonBody()
-    >>> print new_greens['copyright_date']
+    >>> print(new_greens['copyright_date'])
     2005-12-12
     >>> etag_after_server_modification = new_greens['http_etag']
 
@@ -652,8 +652,8 @@
 fail, right?
 
     >>> body = {'description' : 'New description.'}
-    >>> print modify_cookbook('Everyday Greens', body, 'PATCH',
-    ...                       {'If-Match' : etag_before_server_modification})
+    >>> print(modify_cookbook('Everyday Greens', body, 'PATCH',
+    ...                       {'If-Match' : etag_before_server_modification}))
     HTTP/1.1 209 Content Returned
     ...
 
@@ -690,8 +690,8 @@
 ETag will never match anything, you'll always get a 412 error.)
 
     >>> body = {'description' : 'New description.'}
-    >>> print modify_cookbook('Everyday Greens', body, 'PATCH',
-    ...                       {'If-Match' : "Weird etag"})
+    >>> print(modify_cookbook('Everyday Greens', body, 'PATCH',
+    ...                       {'If-Match' : "Weird etag"}))
     HTTP/1.1 412 Precondition Failed
     ...
 
@@ -706,16 +706,16 @@
 A totally bogus ETag fails with a 412 error.
 
     >>> greens['description'] = 'Another new description'
-    >>> print modify_cookbook('Everyday Greens', greens, 'PUT',
-    ...                       {'If-Match' : "Not the old ETag"})
+    >>> print(modify_cookbook('Everyday Greens', greens, 'PUT',
+    ...                       {'If-Match' : "Not the old ETag"}))
     HTTP/1.1 412 Precondition Failed
     ...
 
 When we use the original ETag, we don't cause a 412 error, but the PUT
 request fails anyway.
 
-    >>> print modify_cookbook('Everyday Greens', greens, 'PUT',
-    ...                       {'If-Match' : old_etag})
+    >>> print(modify_cookbook('Everyday Greens', greens, 'PUT',
+    ...                       {'If-Match' : old_etag}))
     HTTP/1.1 400 Bad Request
     ...
     http_etag: You tried to modify a read-only attribute.
@@ -735,15 +735,15 @@
 
     >>> new_etag = webservice.get(greens_url).jsonBody()['http_etag']
 
-    >>> print webservice.get(
+    >>> print(webservice.get(
     ...     greens_url,
-    ...     headers={'If-None-Match': new_etag})
+    ...     headers={'If-None-Match': new_etag}))
     HTTP/1.1 304 Not Modified
     ...
 
-    >>> print webservice.get(
+    >>> print(webservice.get(
     ...     greens_url,
-    ...     headers={'If-None-Match': "changed" + new_etag})
+    ...     headers={'If-None-Match': "changed" + new_etag}))
     HTTP/1.1 200 Ok
     ...
 
@@ -767,7 +767,7 @@
 
     >>> recipe_url = '/recipes/3'
     >>> recipe = webservice.get(recipe_url).jsonBody()
-    >>> print recipe['dish_link']
+    >>> print(recipe['dish_link'])
     http://.../dishes/Roast%20chicken
 
     >>> def modify_dish(url, recipe, new_dish_url):
@@ -778,18 +778,18 @@
     >>> new_dish = webservice.get(quote('/dishes/Baked beans')).jsonBody()
     >>> new_dish_url = new_dish['self_link']
     >>> recipe['dish_link'] = new_dish_url
-    >>> print modify_dish(recipe_url, recipe, new_dish_url)
+    >>> print(modify_dish(recipe_url, recipe, new_dish_url))
     HTTP/1.1 209 Content Returned
     ...
 
     >>> recipe = webservice.get(recipe_url).jsonBody()
-    >>> print recipe['dish_link']
+    >>> print(recipe['dish_link'])
     http://.../dishes/Baked%20beans
 
 Identification of the dish is done by specifying a URL; a random
 string won't work.
 
-    >>> print modify_dish(recipe_url, recipe, 'A random string')
+    >>> print(modify_dish(recipe_url, recipe, 'A random string'))
     HTTP/1.1 400 Bad Request
     ...
     dish_link: "A random string" is not a valid URI.
@@ -797,14 +797,14 @@
 But not just any URL will do. It has to identify an object in the web
 service.
 
-    >>> print modify_dish(recipe_url, recipe, 'http://www.canonical.com')
+    >>> print(modify_dish(recipe_url, recipe, 'http://www.canonical.com'))
     HTTP/1.1 400 Bad Request
     ...
     dish_link: No such object "http://www.canonical.com".
 
-    >>> print modify_dish(
+    >>> print(modify_dish(
     ...     recipe_url, recipe,
-    ...     'http://www.canonical.com/dishes/Baked%20beans')
+    ...     'http://www.canonical.com/dishes/Baked%20beans'))
     HTTP/1.1 400 Bad Request
     ...
     dish_link: No such object "http://www.canonical.com/dishes/Baked%20beans".
@@ -813,7 +813,7 @@
 of HTTP).
 
     >>> https_link = recipe['dish_link'].replace('http:', 'https:')
-    >>> print modify_dish(recipe_url, recipe, https_link)
+    >>> print(modify_dish(recipe_url, recipe, https_link))
     HTTP/1.1 400 Bad Request
     ...
     dish_link: No such object "https://.../Baked%20beans".
@@ -822,7 +822,7 @@
 the object isn't the right kind of object. A recipe must be for a
 dish, not a cookbook:
 
-    >>> print modify_dish(recipe_url, recipe, recipe['cookbook_link'])
+    >>> print(modify_dish(recipe_url, recipe, recipe['cookbook_link']))
     HTTP/1.1 400 Bad Request
     ...
     dish_link: Your value points to the wrong kind of object
@@ -858,53 +858,53 @@
 The two 400 error codes below are caused by a failure to understand
 the assertion. The string used in the assertion might not be a date.
 
-    >>> print patch_greens_copyright_date('dummy')
+    >>> print(patch_greens_copyright_date('dummy'))
     HTTP/1.1 400 Bad Request
     ...
     copyright_date: Value doesn't look like a date.
 
 Or it might be a date that's not in UTC.
 
-    >>> print patch_greens_copyright_date(u'2005-06-06T00:00:00.000000+05:00')
+    >>> print(patch_greens_copyright_date(u'2005-06-06T00:00:00.000000+05:00'))
     HTTP/1.1 400 Bad Request
     ...
     copyright_date: Time not in UTC.
 
 There are five ways to specify UTC:
 
-    >>> print patch_greens_copyright_date(u'2003-01-01T00:00:00.000000Z')
-    HTTP/1.1 209 Content Returned
-    ...
-
-    >>> print patch_greens_copyright_date(u'2003-01-01T00:00:00.000000+00:00')
-    HTTP/1.1 209 Content Returned
-    ...
-
-    >>> print patch_greens_copyright_date(u'2003-01-01T00:00:00.000000+0000')
-    HTTP/1.1 209 Content Returned
-    ...
-
-    >>> print patch_greens_copyright_date(u'2003-01-01T00:00:00.000000-00:00')
-    HTTP/1.1 209 Content Returned
-    ...
-
-    >>> print patch_greens_copyright_date(u'2003-01-01T00:00:00.000000-0000')
+    >>> print(patch_greens_copyright_date(u'2003-01-01T00:00:00.000000Z'))
+    HTTP/1.1 209 Content Returned
+    ...
+
+    >>> print(patch_greens_copyright_date(u'2003-01-01T00:00:00.000000+00:00'))
+    HTTP/1.1 209 Content Returned
+    ...
+
+    >>> print(patch_greens_copyright_date(u'2003-01-01T00:00:00.000000+0000'))
+    HTTP/1.1 209 Content Returned
+    ...
+
+    >>> print(patch_greens_copyright_date(u'2003-01-01T00:00:00.000000-00:00'))
+    HTTP/1.1 209 Content Returned
+    ...
+
+    >>> print(patch_greens_copyright_date(u'2003-01-01T00:00:00.000000-0000'))
     HTTP/1.1 209 Content Returned
     ...
 
 A value with a missing timezone is treated as UTC.
 
-    >>> print patch_greens_copyright_date(u'2003-01-01T00:00:00.000000')
+    >>> print(patch_greens_copyright_date(u'2003-01-01T00:00:00.000000'))
     HTTP/1.1 209 Content Returned
     ...
 
 Less precise time measurements may also be acceptable.
 
-    >>> print patch_greens_copyright_date(u'2003-01-01T00:00:00Z')
+    >>> print(patch_greens_copyright_date(u'2003-01-01T00:00:00Z'))
     HTTP/1.1 209 Content Returned
     ...
 
-    >>> print patch_greens_copyright_date(u'2003-01-01')
+    >>> print(patch_greens_copyright_date(u'2003-01-01'))
     HTTP/1.1 209 Content Returned
     ...
 
@@ -914,30 +914,30 @@
 A document that would be acceptable as the payload of a PATCH request
 might not be acceptable as the payload of a PUT request.
 
-    >>> print modify_cookbook('Everyday Greens', {'name' : 'Greens'}, 'PUT')
+    >>> print(modify_cookbook('Everyday Greens', {'name' : 'Greens'}, 'PUT'))
     HTTP/1.1 400 Bad Request
     ...
     You didn't specify a value for the attribute 'description'.
 
 A document that's not a valid JSON document is also unacceptable.
 
-    >>> print webservice.patch(greens_url, "application/json", "{")
+    >>> print(webservice.patch(greens_url, "application/json", "{"))
     HTTP/1.1 400 Bad Request
     ...
     Entity-body was not a well-formed JSON document.
 
 A document that's valid JSON but is not a JSON hash is unacceptable.
 
-    >>> print modify_cookbook('Everyday Greens', 'name=Greens', 'PATCH')
+    >>> print(modify_cookbook('Everyday Greens', 'name=Greens', 'PATCH'))
     HTTP/1.1 400 Bad Request
     ...
     Expected a JSON hash.
 
 An entry's read-only attributes can't be modified.
 
-    >>> print modify_cookbook(
+    >>> print(modify_cookbook(
     ...     'Everyday Greens',
-    ...     {'copyright_date' : u'2001-01-01T01:01:01+00:00Z'}, 'PATCH')
+    ...     {'copyright_date' : u'2001-01-01T01:01:01+00:00Z'}, 'PATCH'))
     HTTP/1.1 400 Bad Request
     ...
     copyright_date: You tried to modify a read-only attribute.
@@ -945,17 +945,17 @@
 You can send a document that includes a value for a read-only
 attribute, but it has to be the same as the current value.
 
-    >>> print modify_cookbook(
+    >>> print(modify_cookbook(
     ...     'Everyday Greens',
-    ...     {'copyright_date' : greens['copyright_date']}, 'PATCH')
+    ...     {'copyright_date' : greens['copyright_date']}, 'PATCH'))
     HTTP/1.1 209 Content Returned
     ...
 
 You can't change the link to an entry's associated collection.
 
-    >>> print modify_cookbook('Everyday Greens',
+    >>> print(modify_cookbook('Everyday Greens',
     ...                       {'recipes_collection_link' : 'dummy'},
-    ...                       'PATCH')
+    ...                       'PATCH'))
     HTTP/1.1 400 Bad Request
     ...
     recipes_collection_link: You tried to modify a collection...
@@ -963,33 +963,33 @@
 Again, you can send a document that includes a value for an associated
 collection link; you just can't _change_ the value.
 
-    >>> print modify_cookbook(
+    >>> print(modify_cookbook(
     ...     'Everyday Greens',
     ...     {'recipes_collection_link' : greens['recipes_collection_link']},
-    ...     'PATCH')
+    ...     'PATCH'))
     HTTP/1.1 209 Content Returned
     ...
 
 You can't directly change an entry's URL address.
 
-    >>> print modify_cookbook('Everyday Greens',
-    ...                       {'self_link' : 'dummy'}, 'PATCH')
+    >>> print(modify_cookbook('Everyday Greens',
+    ...                       {'self_link' : 'dummy'}, 'PATCH'))
     HTTP/1.1 400 Bad Request
     ...
     self_link: You tried to modify a read-only attribute.
 
 You can't directly change an entry's ETag.
 
-    >>> print modify_cookbook('Everyday Greens',
-    ...                       {'http_etag' : 'dummy'}, 'PATCH')
+    >>> print(modify_cookbook('Everyday Greens',
+    ...                       {'http_etag' : 'dummy'}, 'PATCH'))
     HTTP/1.1 400 Bad Request
     ...
     http_etag: You tried to modify a read-only attribute.
 
 You can't change an entry's resource type.
 
-    >>> print modify_cookbook('Everyday Greens',
-    ...                       {'resource_type_link' : 'dummy'}, 'PATCH')
+    >>> print(modify_cookbook('Everyday Greens',
+    ...                       {'resource_type_link' : 'dummy'}, 'PATCH'))
     HTTP/1.1 400 Bad Request
     ...
     resource_type_link: You tried to modify a read-only attribute.
@@ -998,8 +998,8 @@
 though it were the actual object. A cookbook has a
 'recipes_collection_link', but it doesn't have 'recipes' directly.
 
-    >>> print modify_cookbook(
-    ...     'Everyday Greens', {'recipes' : 'dummy'}, 'PATCH')
+    >>> print(modify_cookbook(
+    ...     'Everyday Greens', {'recipes' : 'dummy'}, 'PATCH'))
     HTTP/1.1 400 Bad Request
     ...
     recipes: You tried to modify a nonexistent attribute.
@@ -1007,8 +1007,8 @@
 A recipe has a 'dish_link', but it doesn't have a 'dish' directly.
 
     >>> url = quote('/cookbooks/The Joy of Cooking/Roast chicken')
-    >>> print webservice.patch(url, 'application/json',
-    ...     simplejson.dumps({'dish' : 'dummy'}))
+    >>> print(webservice.patch(url, 'application/json',
+    ...     simplejson.dumps({'dish' : 'dummy'})))
     HTTP/1.1 400 Bad Request
     ...
     dish: You tried to modify a nonexistent attribute.
@@ -1016,16 +1016,16 @@
 You can't set values that violate data integrity rules. For instance,
 you can't set a required value to None.
 
-    >>> print modify_cookbook('Everyday Greens',
-    ...                       {'name' : None}, 'PATCH')
+    >>> print(modify_cookbook('Everyday Greens',
+    ...                       {'name' : None}, 'PATCH'))
     HTTP/1.1 400 Bad Request
     ...
     name: Missing required value.
 
 And of course you can't modify attributes that don't exist.
 
-    >>> print modify_cookbook(
-    ...     'Everyday Greens', {'nonesuch' : 'dummy'}, 'PATCH')
+    >>> print(modify_cookbook(
+    ...     'Everyday Greens', {'nonesuch' : 'dummy'}, 'PATCH'))
     HTTP/1.1 400 Bad Request
     ...
     nonesuch: You tried to modify a nonexistent attribute.
@@ -1037,14 +1037,14 @@
 example web service, recipes can be deleted.
 
     >>> recipe_url = "/recipes/6"
-    >>> print webservice.get(recipe_url)
-    HTTP/1.1 200 Ok
-    ...
-
-    >>> print webservice.delete(recipe_url)
-    HTTP/1.1 200 Ok
-    ...
-
-    >>> print webservice.get(recipe_url)
+    >>> print(webservice.get(recipe_url))
+    HTTP/1.1 200 Ok
+    ...
+
+    >>> print(webservice.delete(recipe_url))
+    HTTP/1.1 200 Ok
+    ...
+
+    >>> print(webservice.get(recipe_url))
     HTTP/1.1 404 Not Found
     ...

=== modified file 'src/lazr/restful/example/base/tests/field.txt'
--- src/lazr/restful/example/base/tests/field.txt	2011-07-27 21:28:35 +0000
+++ src/lazr/restful/example/base/tests/field.txt	2020-02-04 11:56:15 +0000
@@ -18,10 +18,10 @@
     ...     return webservice(field_url, 'PATCH',
     ...                       simplejson.dumps(description)).jsonBody()
 
-    >>> print set_description("New description")
+    >>> print(set_description("New description"))
     New description
 
-    >>> print webservice.get(field_url)
+    >>> print(webservice.get(field_url))
     HTTP/1.1 200 Ok
     ...
     Content-Type: application/json
@@ -31,20 +31,20 @@
 PATCH on a field resource works identically to PUT.
 
     >>> representation = simplejson.dumps('<b>Bold description</b>')
-    >>> print webservice.put(field_url, 'application/json',
-    ...                      representation).jsonBody()
+    >>> print(webservice.put(field_url, 'application/json',
+    ...                      representation).jsonBody())
     <b>Bold description</b>
 
 If you get a field that contains a link to another object, you'll see
 the link, rather than the actual object.
 
     >>> link_field_url = "/recipes/3/cookbook_link"
-    >>> print webservice.get(link_field_url).jsonBody()
+    >>> print(webservice.get(link_field_url).jsonBody())
     http://.../cookbooks/James%20Beard%27s%20American%20Cookery
 
     >>> collection_url = quote(
     ...     "/cookbooks/The Joy of Cooking/recipes_collection_link")
-    >>> print webservice.get(collection_url).jsonBody()
+    >>> print(webservice.get(collection_url).jsonBody())
     http://.../cookbooks/The%20Joy%20of%20Cooking/recipes
 
 Changing a field resource that contains a link works the same way as
@@ -52,10 +52,10 @@
 
     >>> new_value = simplejson.dumps(
     ...     webservice.get(cookbook_url).jsonBody()['self_link'])
-    >>> print new_value
+    >>> print(new_value)
     "http://.../cookbooks/The%20Joy%20of%20Cooking"
 
-    >>> print webservice(link_field_url, 'PATCH', new_value)
+    >>> print(webservice(link_field_url, 'PATCH', new_value))
     HTTP/1.1 209 Content Returned
     ...
     Content-Type: application/json
@@ -67,13 +67,13 @@
 the entry as a whole or just modifying a single field.
 
     >>> date_field_url = cookbook_url + "/copyright_date"
-    >>> print webservice.put(date_field_url, 'application/json',
-    ...                      simplejson.dumps("string"))
+    >>> print(webservice.put(date_field_url, 'application/json',
+    ...                      simplejson.dumps("string")))
     HTTP/1.1 400 Bad Request
     ...
     copyright_date: Value doesn't look like a date.
 
-    >>> print webservice(collection_url, 'PATCH', new_value)
+    >>> print(webservice(collection_url, 'PATCH', new_value))
     HTTP/1.1 400 Bad Request
     ...
     recipes_collection_link: You tried to modify a collection attribute.
@@ -81,10 +81,10 @@
 Field resources also support GET, for when you only need part of an
 entry. You can get either a JSON or XHTML-fragment representation.
 
-    >>> print webservice.get(field_url).jsonBody()
+    >>> print(webservice.get(field_url).jsonBody())
     <b>Bold description</b>
 
-    >>> print webservice.get(field_url, 'application/xhtml+xml')
+    >>> print(webservice.get(field_url, 'application/xhtml+xml'))
     HTTP/1.1 200 Ok
     ...
     Content-Type: application/xhtml+xml
@@ -104,8 +104,8 @@
 
     >>> name_url = cookbook_url + "/name"
     >>> representation = simplejson.dumps("The Joy of Cooking Extreme")
-    >>> print webservice.put(name_url, 'application/json',
-    ...                      representation)
+    >>> print(webservice.put(name_url, 'application/json',
+    ...                      representation))
     HTTP/1.1 301 Moved Permanently
     ...
     Location: http://.../cookbooks/The%20Joy%20of%20Cooking%20Extreme/name
@@ -113,12 +113,12 @@
 
 Note that the entry's URL has also changed.
 
-    >>> print webservice.get(cookbook_url)
+    >>> print(webservice.get(cookbook_url))
     HTTP/1.1 404 Not Found
     ...
 
     >>> new_cookbook_url = quote("/cookbooks/The Joy of Cooking Extreme")
-    >>> print webservice.get(new_cookbook_url)
+    >>> print(webservice.get(new_cookbook_url))
     HTTP/1.1 200 Ok
     ...
 
@@ -126,8 +126,8 @@
 
     >>> representation = simplejson.dumps("The Joy of Cooking")
     >>> new_name_url = new_cookbook_url + "/name"
-    >>> print webservice.put(new_name_url, 'application/json',
-    ...                      representation)
+    >>> print(webservice.put(new_name_url, 'application/json',
+    ...                      representation))
     HTTP/1.1 301 Moved Permanently
     ...
     Location: http://.../cookbooks/The%20Joy%20of%20Cooking/name
@@ -144,7 +144,7 @@
 within the cookbook entry itself.
 
     >>> cookbook = webservice.get(cookbook_url).jsonBody()
-    >>> print cookbook['cuisine']
+    >>> print(cookbook['cuisine'])
     General
 
 Here's the representation of the resource for the same 'cuisine' field.
@@ -167,8 +167,8 @@
 HTML-escaped string, similar to what's seen in the JSON representation
 of the entry.
 
-    >>> print webservice.get(cookbook_url + '/cuisine',
-    ...                      'application/xhtml+xml')
+    >>> print(webservice.get(cookbook_url + '/cuisine',
+    ...                      'application/xhtml+xml'))
     HTTP/1.1 200 Ok
     ...
     General
@@ -180,7 +180,7 @@
 Field resources support GET, PUT, and PATCH.
 
     >>> for method in ['HEAD', 'POST', 'DELETE', 'OPTIONS']:
-    ...     print webservice(field_url, method)
+    ...     print(webservice(field_url, method))
     HTTP/1.1 405 Method Not Allowed...
     Allow: GET PUT PATCH
     ...
@@ -210,13 +210,13 @@
     >>> cookbook_etag == etag
     False
 
-    >>> print webservice.get(field_url, headers={'If-None-Match': etag})
+    >>> print(webservice.get(field_url, headers={'If-None-Match': etag}))
     HTTP/1.1 304 Not Modified
     ...
 
     >>> ignored = set_description("new description")
-    >>> print webservice.get(field_url,
-    ...                      headers={'If-None-Match': etag})
+    >>> print(webservice.get(field_url,
+    ...                      headers={'If-None-Match': etag}))
     HTTP/1.1 200 Ok
     ...
 
@@ -234,18 +234,18 @@
 provided in If-Match is the one we just got from a GET request.
 
     >>> representation = simplejson.dumps("New description")
-    >>> print webservice.put(field_url, 'application/json',
+    >>> print(webservice.put(field_url, 'application/json',
     ...                      representation,
-    ...                      headers={'If-Match': cookbook_etag})
+    ...                      headers={'If-Match': cookbook_etag}))
     HTTP/1.1 209 Content Returned
     ...
 
 But when the field is modified, the ETag changes. Any subsequent
 requests that use that ETag in If-Match will fail.
 
-    >>> print webservice.put(field_url, 'application/json',
+    >>> print(webservice.put(field_url, 'application/json',
     ...                      representation,
-    ...                      headers={'If-Match': cookbook_etag})
+    ...                      headers={'If-Match': cookbook_etag}))
     HTTP/1.1 412 Precondition Failed
     ...
 
@@ -258,7 +258,7 @@
 Every entry has an XHTML representation. The default representation is
 a simple text node.
 
-  >>> print webservice.get(field_url, 'application/xhtml+xml')
+  >>> print(webservice.get(field_url, 'application/xhtml+xml'))
   HTTP/1.1 200 Ok
   ...
   Description
@@ -281,7 +281,7 @@
   ...     """Bold the original string and add a snowman."""
   ...     return simple_renderer
 
-  >>> print webservice.get(cookbook_url +'/name', 'application/xhtml+xml')
+  >>> print(webservice.get(cookbook_url +'/name', 'application/xhtml+xml'))
   HTTP/1.1 200 Ok
   ...
   The Joy of Cooking
@@ -298,7 +298,7 @@
 
   >>> from lazr.restful.testing.helpers import encode_response
   >>> response = webservice.get(field_url, 'application/xhtml+xml')
-  >>> print encode_response(response)
+  >>> print(encode_response(response))
   HTTP/1.1 200 Ok
   ...
   \u2603 <b>Description</b>
@@ -306,8 +306,8 @@
 In fact, that adapter will be used for every ITextLine field of an
 ICookbook.
 
-  >>> print encode_response(
-  ...     webservice.get(cookbook_url +'/name', 'application/xhtml+xml'))
+  >>> print(encode_response(
+  ...     webservice.get(cookbook_url +'/name', 'application/xhtml+xml')))
   HTTP/1.1 200 Ok
   ...
   <b>The Joy of Cooking</b>
@@ -315,15 +315,15 @@
 The adapter will not be used for ITextLine fields of other interfaces:
 
   >>> dish_field_url = quote('/dishes/Roast chicken/name')
-  >>> print webservice.get(dish_field_url, 'application/xhtml+xml')
+  >>> print(webservice.get(dish_field_url, 'application/xhtml+xml'))
   HTTP/1.1 200 Ok
   ...
   Roast chicken
 
 It will not be used for non-text fields of ICookbook.
 
-  >>> print webservice.get(cookbook_url + '/copyright_date',
-  ...                      'application/xhtml+xml')
+  >>> print(webservice.get(cookbook_url + '/copyright_date',
+  ...                      'application/xhtml+xml'))
   HTTP/1.1 200 Ok
   ...
   1995-01-01
@@ -336,13 +336,13 @@
 
   >>> response = webservice.get(
   ...     cookbook_url, 'application/json;include=lp_html')
-  >>> print response.getheader("Content-Type")
+  >>> print(response.getheader("Content-Type"))
   application/json;include=lp_html
 
 The cookbook's description is a normal JSON representation...
 
   >>> json = response.jsonBody()
-  >>> print json['description']
+  >>> print(json['description'])
   Description
 
 ...but the JSON dictionary will include a 'lp_html' sub-dictionary...
@@ -356,10 +356,10 @@
   [u'description', u'name']
 
   >>> from lazr.restful.testing.helpers import encode_unicode
-  >>> print encode_unicode(html['description'])
+  >>> print(encode_unicode(html['description']))
   \u2603 <b>Description</b>
 
-  >>> print encode_unicode(html['name'])
+  >>> print(encode_unicode(html['name']))
   \u2603 <b>The Joy of Cooking</b>
 
 Cleanup
@@ -375,7 +375,7 @@
 
   >>> ignored = set_description("<b>Bold description</b>")
 
-  >>> print webservice.get(field_url, 'application/xhtml+xml')
+  >>> print(webservice.get(field_url, 'application/xhtml+xml'))
   HTTP/1.1 200 Ok
   ...
   &lt;b&gt;Bold description&lt;/b&gt;
@@ -409,7 +409,7 @@
 returns UTF-8 instead of Unicode.
 
   >>> response = webservice.get(field_url, 'application/xhtml+xml')
-  >>> print encode_response(response)
+  >>> print(encode_response(response))
   HTTP/1.1 200 Ok
   ...
   \u2603 <b>Description</b>
@@ -418,7 +418,7 @@
 ICookbook/ITextLine, other ITextLine fields of ICookbook are not
 affected.
 
-  >>> print webservice.get(cookbook_url + '/name', 'application/xhtml+xml')
+  >>> print(webservice.get(cookbook_url + '/name', 'application/xhtml+xml'))
   HTTP/1.1 200 Ok
   ...
   The Joy of Cooking
@@ -427,7 +427,7 @@
 representations of that entry's fields.
 
   >>> response = webservice.get(cookbook_url, 'application/xhtml+xml')
-  >>> print encode_response(response)
+  >>> print(encode_response(response))
   HTTP/1.1 200 Ok
   ...
   <dt>description</dt>
@@ -439,7 +439,7 @@
   >>> ignored = getGlobalSiteManager().unregisterAdapter(
   ...      dummy_renderer, name='description')
 
-  >>> print webservice.get(field_url, 'application/xhtml+xml')
+  >>> print(webservice.get(field_url, 'application/xhtml+xml'))
   HTTP/1.1 200 Ok
   ...
   Description

=== modified file 'src/lazr/restful/example/base/tests/hostedfile.txt'
--- src/lazr/restful/example/base/tests/hostedfile.txt	2009-11-12 16:35:38 +0000
+++ src/lazr/restful/example/base/tests/hostedfile.txt	2020-02-04 11:56:15 +0000
@@ -22,14 +22,14 @@
     u'http://.../cookbooks/Everyday%20Greens/cover'
 
     >>> greens_cover = greens['cover_link']
-    >>> print webservice.get(greens_cover)
+    >>> print(webservice.get(greens_cover))
     HTTP/1.1 404 Not Found
     ...
 
 We can upload a cover with PUT.
 
-    >>> print webservice.put(greens_cover, 'image/png',
-    ...                      "Pretend this is an image file.")
+    >>> print(webservice.put(greens_cover, 'image/png',
+    ...                      "Pretend this is an image file."))
     HTTP/1.1 200 Ok
     ...
 
@@ -38,7 +38,7 @@
 Internet.
 
     >>> result = webservice.get(greens_cover)
-    >>> print result
+    >>> print(result)
     HTTP/1.1 303 See Other
     ...
     Location: http://cookbooks.dev/.../filemanager/0
@@ -53,7 +53,7 @@
 
     >>> filemanager_url = result.getheader('location')
     >>> response = webservice.get(filemanager_url)
-    >>> print response
+    >>> print(response)
     HTTP/1.1 200 Ok
     ...
     Content-Type: image/png
@@ -64,7 +64,7 @@
 The simple file manager has some nice features like setting the
 Content-Disposition, Last-Modified, and ETag headers.
 
-    >>> print response.getheader('Content-Disposition')
+    >>> print(response.getheader('Content-Disposition'))
     attachment; filename="cover"
 
 Note that the name of the file is "cover", the same as the field
@@ -79,25 +79,25 @@
 Make a second request using the ETag, and you'll get the response code 304
 ("Not Modified").
 
-    >>> print webservice.get(filemanager_url,
-    ...                      headers={'If-None-Match': etag})
+    >>> print(webservice.get(filemanager_url,
+    ...                      headers={'If-None-Match': etag}))
     HTTP/1.1 304 Not Modified
     ...
 
 PUT is also used to modify a hosted file. Here's one that provides a
 filename as part of Content-Disposition.
 
-    >>> print webservice.put(greens_cover, 'image/png',
+    >>> print(webservice.put(greens_cover, 'image/png',
     ...                      "Pretend this is another image file.",
     ...                      {'Content-Disposition':
-    ...                       'attachment; filename="greens-cover.png"'})
+    ...                       'attachment; filename="greens-cover.png"'}))
     HTTP/1.1 200 Ok
     ...
 
 The new cover is available at a different URL.
 
     >>> result = webservice.get(greens_cover)
-    >>> print result
+    >>> print(result)
     HTTP/1.1 303 See Other
     ...
     Location: http://cookbooks.dev/.../filemanager/1
@@ -107,7 +107,7 @@
 back to us in the Content-Disposition header.
 
     >>> filemanager_url = result.getheader('location')
-    >>> print webservice.get(filemanager_url)
+    >>> print(webservice.get(filemanager_url))
     HTTP/1.1 200 Ok
     ...
     Content-Disposition: attachment; filename="greens-cover.png"
@@ -118,11 +118,11 @@
 real web service to define a more complex named operation that
 manipulates uploaded files.
 
-    >>> print webservice.named_post(greens_url, 'replace_cover',
-    ...                             cover='\x01\x02')
+    >>> print(webservice.named_post(greens_url, 'replace_cover',
+    ...                             cover='\x01\x02'))
     HTTP/1.1 200 Ok
     ...
-    >>> print webservice.get(greens_cover)
+    >>> print(webservice.get(greens_cover))
     HTTP/1.1 303 See Other
     ...
     Location: http://cookbooks.dev/devel/filemanager/2
@@ -130,11 +130,11 @@
 
 Deleting a cover (with DELETE) disables the redirect.
 
-    >>> print webservice.delete(greens_cover)
+    >>> print(webservice.delete(greens_cover))
     HTTP/1.1 200 Ok
     ...
 
-    >>> print webservice.get(greens_cover)
+    >>> print(webservice.get(greens_cover))
     HTTP/1.1 404 Not Found
     ...
 
@@ -148,8 +148,8 @@
     >>> greens['cover_link'] = 'http://google.com/logo.png'
 
     >>> import simplejson
-    >>> print webservice.put(greens_url, 'application/json',
-    ...     simplejson.dumps(greens))
+    >>> print(webservice.put(greens_url, 'application/json',
+    ...     simplejson.dumps(greens)))
     HTTP/1.1 400 Bad Request
     ...
     cover_link: To modify this field you need to send a PUT request to its
@@ -159,12 +159,12 @@
 delete it.
 
    >>> url = '/recipes/1/prepared_image'
-   >>> print webservice.put(url, 'application/x-tar-gz', 'fakefiledata')
+   >>> print(webservice.put(url, 'application/x-tar-gz', 'fakefiledata'))
    HTTP/1.1 405 Method Not Allowed...
    Allow: GET
    ...
 
-   >>> print webservice.delete(url)
+   >>> print(webservice.delete(url))
    HTTP/1.1 405 Method Not Allowed...
    Allow: GET
    ...

=== modified file 'src/lazr/restful/example/base/tests/redirect.txt'
--- src/lazr/restful/example/base/tests/redirect.txt	2011-01-17 23:48:11 +0000
+++ src/lazr/restful/example/base/tests/redirect.txt	2020-02-04 11:56:15 +0000
@@ -11,7 +11,7 @@
     >>> from lazr.restful.testing.webservice import WebServiceCaller
     >>> webservice = WebServiceCaller(domain='cookbooks.dev')
 
-    >>> print webservice.get("/cookbooks/featured")
+    >>> print(webservice.get("/cookbooks/featured"))
     HTTP/1.1 301 Moved Permanently
     ...
     Location: http://.../cookbooks/Mastering%20the%20Art%20of%20French%20Cooking
@@ -28,15 +28,15 @@
     >>> from lazr.restful.testing.webservice import (
     ...     WebServiceAjaxCaller)
     >>> ajax = WebServiceAjaxCaller(domain='cookbooks.dev')
-    >>> print ajax.get("/cookbooks/featured")
+    >>> print(ajax.get("/cookbooks/featured"))
     HTTP/1.1 301 Moved Permanently
     ...
     Location: http://.../cookbooks/Mastering%20the%20Art%20of%20French%20Cooking?ws.accept=application/json
     ...
 
-    >>> print ajax.get(
+    >>> print(ajax.get(
     ...     "/cookbooks/featured",
-    ...     headers=dict(Accept="application/xhtml+xml"))
+    ...     headers=dict(Accept="application/xhtml+xml")))
     HTTP/1.1 301 Moved Permanently
     ...
     Location: http://...?ws.accept=application/xhtml%2Bxml
@@ -46,7 +46,7 @@
 valid in URIs. In this case, the redirect is to a URL that contains
 curly braces (see traversal.py for details).
 
-    >>> print ajax.get("/cookbooks/featured-invalid")
+    >>> print(ajax.get("/cookbooks/featured-invalid"))
     HTTP/1.1 301 Moved Permanently
     ...
     Location: http://.../Mastering%20the%20Art%20of%20French%20Cooking{invalid}?ws.accept=application/json

=== modified file 'src/lazr/restful/example/base/tests/representation-cache.txt'
--- src/lazr/restful/example/base/tests/representation-cache.txt	2010-06-14 15:24:20 +0000
+++ src/lazr/restful/example/base/tests/representation-cache.txt	2020-02-04 11:56:15 +0000
@@ -41,13 +41,13 @@
 
     >>> from lazr.restful.example.base.root import C4 as greens_object
     >>> json = "application/json"
-    >>> print cache.get(greens_object, json, "devel")
+    >>> print(cache.get(greens_object, json, "devel"))
     None
-    >>> print cache.get(greens_object, json, "devel", "missing")
+    >>> print(cache.get(greens_object, json, "devel", "missing"))
     missing
 
     >>> cache.set(greens_object, json, "devel", "This is the 'devel' value.")
-    >>> print cache.get(greens_object, json, "devel")
+    >>> print(cache.get(greens_object, json, "devel"))
     This is the 'devel' value.
     >>> sorted(dictionary.keys())
     ['http://cookbooks.dev/devel/cookbooks/Everyday%20Greens,application/json']
@@ -56,7 +56,7 @@
 for different versions.
 
     >>> cache.set(greens_object, json, "1.0", "This is the '1.0' value.")
-    >>> print cache.get(greens_object, json, "1.0")
+    >>> print(cache.get(greens_object, json, "1.0"))
     This is the '1.0' value.
     >>> sorted(dictionary.keys())
     ['http://cookbooks.dev/1.0/cookbooks/Everyday%20Greens,application/json',
@@ -67,9 +67,9 @@
     >>> cache.delete(greens_object)
     >>> sorted(dictionary.keys())
     []
-    >>> print cache.get(greens_object, json, "devel")
+    >>> print(cache.get(greens_object, json, "devel"))
     None
-    >>> print cache.get(greens_object, json, "1.0")
+    >>> print(cache.get(greens_object, json, "1.0"))
     None
 
 DO_NOT_CACHE
@@ -103,7 +103,7 @@
     >>> test_cache.set("Don't cache this.", json, "cache everything!",
     ...                "representation")
     >>> for key in sorted(test_dict.keys()):
-    ...     print key
+    ...     print(key)
     Cache this.,application/json,1.0
     Don't cache this.,application/json,cache everything!
 
@@ -112,7 +112,7 @@
 
     >>> bad_key = "Don't cache this.,application/json,1.0"
     >>> test_dict[bad_key] = "This representation should not be cached."
-    >>> print test_cache.get("Don't cache this.", json, "1.0")
+    >>> print(test_cache.get("Don't cache this.", json, "1.0"))
     None
 
 A representation cache
@@ -135,7 +135,7 @@
     >>> recipe_url = "/recipes/1"
     >>> ignored = webservice.get(recipe_url)
     >>> [the_only_key] = dictionary.keys()
-    >>> print the_only_key
+    >>> print(the_only_key)
     http://cookbooks.dev/devel/recipes/1,application/json
 
 Note that the cache key incorporates the web service version name
@@ -145,7 +145,7 @@
 Associated with the key is a string: the JSON representation of the object.
 
     >>> import simplejson
-    >>> print simplejson.loads(dictionary[the_only_key])['self_link']
+    >>> print(simplejson.loads(dictionary[the_only_key])['self_link'])
     http://cookbooks.dev/devel/recipes/1
 
 If we get a representation of the same resource from a different web
@@ -153,7 +153,7 @@
 
     >>> ignored = webservice.get(recipe_url, api_version="1.0")
     >>> for key in sorted(dictionary.keys()):
-    ...     print key
+    ...     print(key)
     http://cookbooks.dev/1.0/recipes/1,application/json
     http://cookbooks.dev/devel/recipes/1,application/json
 
@@ -174,14 +174,14 @@
 
     >>> old_instructions = webservice.get(
     ...     recipe_url, api_version='devel').jsonBody()['instructions']
-    >>> print old_instructions
+    >>> print(old_instructions)
     You can always judge...
     >>> response = webservice.patch(recipe_url, 'application/json',
     ...     simplejson.dumps(dict(instructions="New instructions")),
     ...     api_version='devel')
-    >>> print response.status
+    >>> print(response.status)
     209
-    >>> print response.jsonBody()['instructions']
+    >>> print(response.jsonBody()['instructions'])
     New instructions
 
 The modified representation is immediately available in the cache.
@@ -189,7 +189,7 @@
     >>> from lazr.restful.example.base.root import RECIPES
     >>> recipe = [recipe for recipe in RECIPES if recipe.id == 1][0]
     >>> cached_representation = cache.get(recipe, json, 'devel')
-    >>> print simplejson.loads(cached_representation)['instructions']
+    >>> print(simplejson.loads(cached_representation)['instructions'])
     New instructions
 
 Cleanup.
@@ -206,14 +206,14 @@
     >>> cookbook = [cookbook for cookbook in COOKBOOKS
     ...             if cookbook.name == "Everyday Greens"][0]
     >>> cache.set(cookbook, json, 'devel', "Dummy value.")
-    >>> print dictionary.keys()[0]
+    >>> print(dictionary.keys()[0])
     http://.../devel/cookbooks/Everyday%20Greens,application/json
 
     >>> from urllib import quote
     >>> greens_url = quote("/cookbooks/Everyday Greens")
     >>> ignore = webservice.named_post(
     ...     greens_url, "replace_cover", cover="foo")
-    >>> print len(dictionary.keys())
+    >>> print(len(dictionary.keys()))
     0
 
 But unless the web service is the only way to manipulate a data set,
@@ -231,13 +231,13 @@
 the cache's delete() method.
 
     >>> ignore = webservice.get(recipe_url, api_version='devel')
-    >>> print cache.get(recipe, json, 'devel')
+    >>> print(cache.get(recipe, json, 'devel'))
     {...}
     >>> cache.delete(recipe)
 
 This deletes all the relevant representations.
 
-    >>> print cache.get(recipe, json, 'devel')
+    >>> print(cache.get(recipe, json, 'devel'))
     None
     >>> dictionary.keys()
     []
@@ -251,7 +251,7 @@
 representation is not added to the cache.
 
     >>> greens = webservice.get(greens_url).jsonBody()
-    >>> print greens['confirmed']
+    >>> print(greens['confirmed'])
     tag:launchpad.net:2008:redacted
 
     >>> dictionary.keys()
@@ -274,12 +274,12 @@
 definitely comes from the cache, not the original data source.
 
     >>> cached_greens = webservice.get(greens_url).jsonBody()
-    >>> print cached_greens['name']
+    >>> print(cached_greens['name'])
     This comes from the cache; it is not generated.
 
 But the redacted value is still redacted.
 
-    >>> print cached_greens['confirmed']
+    >>> print(cached_greens['confirmed'])
     tag:launchpad.net:2008:redacted
 
 Cleanup: clear the cache.
@@ -294,7 +294,7 @@
 
     >>> recipe_url ="/recipes/5"
     >>> response = webservice.get(recipe_url)
-    >>> print response.status
+    >>> print(response.status)
     401
     >>> len(dictionary.keys())
     0
@@ -306,7 +306,7 @@
     >>> from lazr.restful.example.base.root import C3_D2 as recipe
     >>> recipe.private = False
 
-    >>> print webservice.get("/recipes/5").jsonBody()['instructions']
+    >>> print(webservice.get("/recipes/5").jsonBody()['instructions'])
     Without doubt the most famous...
 
 Now there's a representation in the cache.
@@ -321,7 +321,7 @@
 
     >>> recipe.private = True
     >>> response = webservice.get(recipe_url)
-    >>> print response.status
+    >>> print(response.status)
     401
 
 Cleanup: clear the cache.
@@ -351,7 +351,7 @@
 
     >>> for instructions in (
     ...     sorted(recipe['instructions'] for recipe in recipes)):
-    ...     print instructions
+    ...     print(instructions)
     A perfectly roasted chicken is...
     Draw, singe, stuff, and truss...
     ...
@@ -362,7 +362,7 @@
 populated the cache.
 
     >>> for key in sorted(dictionary.keys()):
-    ...     print key
+    ...     print(key)
     http://cookbooks.dev/devel/recipes/1,application/json
     http://cookbooks.dev/devel/recipes/2,application/json
     http://cookbooks.dev/devel/recipes/3,application/json
@@ -379,7 +379,7 @@
     >>> recipes = webservice.get("/recipes").jsonBody()['entries']
     >>> for instructions in (
     ...     sorted(recipe['instructions'] for recipe in recipes)):
-    ...     print instructions
+    ...     print(instructions)
     This representation is from the cache.
     This representation is from the cache.
     This representation is from the cache.
@@ -394,7 +394,7 @@
 
     >>> from lazr.restful.interfaces import IWebServiceConfiguration
     >>> config = getUtility(IWebServiceConfiguration)
-    >>> print config.enable_server_side_representation_cache
+    >>> print(config.enable_server_side_representation_cache)
     True
 
 Set this configuration value to False, and representations will not be
@@ -404,7 +404,7 @@
     >>> recipes = webservice.get("/recipes").jsonBody()['entries']
     >>> for instructions in (
     ...     sorted(recipe['instructions'] for recipe in recipes)):
-    ...     print instructions
+    ...     print(instructions)
     A perfectly roasted chicken is...
     Draw, singe, stuff, and truss...
     Preheat oven to...
@@ -419,7 +419,7 @@
 
 The cache is still registered as a utility.
 
-    >>> print getUtility(IRepresentationCache)
+    >>> print(getUtility(IRepresentationCache))
     <lazr.restful.simple.DictionaryBasedRepresentationCache object ...>
 
 And it's still populated, as we can see by re-enabling it.
@@ -428,7 +428,7 @@
     >>> recipes = webservice.get("/recipes").jsonBody()['entries']
     >>> for instructions in (
     ...     sorted(recipe['instructions'] for recipe in recipes)):
-    ...     print instructions
+    ...     print(instructions)
     This representation is from the cache.
     This representation is from the cache.
     This representation is from the cache.
@@ -454,7 +454,7 @@
     >>> recipes = webservice.get("/recipes").jsonBody()['entries']
     >>> for instructions in (
     ...     sorted(recipe['instructions'] for recipe in recipes)):
-    ...     print instructions
+    ...     print(instructions)
     A perfectly roasted chicken is...
     Draw, singe, stuff, and truss...
     Preheat oven to...

=== modified file 'src/lazr/restful/example/base/tests/root.txt'
--- src/lazr/restful/example/base/tests/root.txt	2010-05-10 11:48:42 +0000
+++ src/lazr/restful/example/base/tests/root.txt	2020-02-04 11:56:15 +0000
@@ -17,7 +17,7 @@
     >>> top_level_links['cookbooks_collection_link']
     u'http://cookbooks.dev/devel/cookbooks'
 
-    >>> print top_level_links['resource_type_link']
+    >>> print(top_level_links['resource_type_link'])
     http://cookbooks.dev/devel/#service-root
 
 The client can explore the entire web service by following these links
@@ -29,7 +29,7 @@
 
 There is no XHTML representation available for the service root.
 
-    >>> print webservice.get('/', 'application/xhtml+xml')
+    >>> print(webservice.get('/', 'application/xhtml+xml'))
     HTTP/1.1 200 Ok
     ...
     Content-Type: application/json
@@ -40,7 +40,7 @@
 HEAD and OPTIONS.
 
     >>> for method in ['HEAD', 'POST', 'PUT', 'DELETE', 'OPTIONS']:
-    ...     print webservice("/", method)
+    ...     print(webservice("/", method))
     HTTP/1.1 405 Method Not Allowed...
     Allow: GET
     ...
@@ -110,7 +110,7 @@
 root. The cookbook web service has a 'featured cookbook' which may
 change over time.
 
-    >>> print top_level_links['featured_cookbook_link']
+    >>> print(top_level_links['featured_cookbook_link'])
     http://.../cookbooks/featured
 
 Caching policy
@@ -121,13 +121,13 @@
 service root can be cached for a long time:
 
     >>> response = webservice.get('/', api_version='1.0')
-    >>> print response.getheader('Cache-Control')
+    >>> print(response.getheader('Cache-Control'))
     max-age=10000
 
 The latest version of the service root should be cached for less time.
 
     >>> response = webservice.get('/', api_version='devel')
-    >>> print response.getheader('Cache-Control')
+    >>> print(response.getheader('Cache-Control'))
     max-age=2
 
 Both the WADL and JSON representations of the service root are
@@ -135,7 +135,7 @@
 
     >>> wadl_type = 'application/vnd.sun.wadl+xml'
     >>> response = webservice.get('/', wadl_type)
-    >>> print response.getheader('Cache-Control')
+    >>> print(response.getheader('Cache-Control'))
     max-age=2
 
 The Date header is set along with Cache-Control so that the client can
@@ -152,7 +152,7 @@
     ...     '/', wadl_type, headers={'If-None-Match' : etag})
     >>> conditional_response.status
     304
-    >>> print conditional_response.getheader('Cache-Control')
+    >>> print(conditional_response.getheader('Cache-Control'))
     max-age=2
     >>> conditional_response.getheader('Date') is None
     False
@@ -166,9 +166,9 @@
     >>> agent = 'Python-httplib2/$Rev: 259$'
     >>> response = webservice.get(
     ...     '/', wadl_type, headers={'User-Agent' : agent})
-    >>> print response.getheader('Cache-Control')
+    >>> print(response.getheader('Cache-Control'))
     None
-    >>> print response.getheader('Date')
+    >>> print(response.getheader('Date'))
     None
 
 If the client identifies as an agent _based on_ httplib2, we take a
@@ -177,7 +177,7 @@
     >>> agent = "Custom client (%s)" % agent
     >>> response = webservice.get(
     ...     '/', wadl_type, headers={'User-Agent' : agent})
-    >>> print response.getheader('Cache-Control')
+    >>> print(response.getheader('Cache-Control'))
     max-age=2
     >>> response.getheader('Date') is None
     False
@@ -192,7 +192,7 @@
     >>> policy[-1] = 0
 
     >>> response = webservice.get('/')
-    >>> print response.getheader('Cache-Control')
+    >>> print(response.getheader('Cache-Control'))
     None
     >>> response.getheader('Date') is None
     True

=== modified file 'src/lazr/restful/example/base/tests/service.txt'
--- src/lazr/restful/example/base/tests/service.txt	2009-11-16 14:25:45 +0000
+++ src/lazr/restful/example/base/tests/service.txt	2020-02-04 11:56:15 +0000
@@ -17,7 +17,7 @@
 
     >>> top_level_response = webservice.get(
     ...     "/", api_version="devel").jsonBody()
-    >>> print top_level_response['resource_type_link']
+    >>> print(top_level_response['resource_type_link'])
     http://cookbooks.dev/devel/#service-root
 
 The web service in examples/multiversion is devoted solely to testing
@@ -28,18 +28,18 @@
 
 An attempt to access a nonexistent resource yields a 404 error.
 
-    >>> print webservice.get("/no-such-resource")
+    >>> print(webservice.get("/no-such-resource"))
     HTTP/1.1 404 Not Found
     ...
 
 An attempt to access an existing resource without versioning the URL
 yields a 404 error.
 
-    >>> print webservice.get("/cookbooks", api_version="/")
+    >>> print(webservice.get("/cookbooks", api_version="/"))
     HTTP/1.1 404 Not Found
     ...
 
-    >>> print webservice.get("/", api_version="/")
+    >>> print(webservice.get("/", api_version="/"))
     HTTP/1.1 404 Not Found
     ...
 
@@ -49,23 +49,23 @@
 An attempt to use an unsupported or nonexistent HTTP method on a
 resource yields a 405 error.
 
-    >>> print webservice("/", method="COPY")
+    >>> print(webservice("/", method="COPY"))
     HTTP/1.1 405 Method Not Allowed...
     Allow: GET
     ...
 
-    >>> print webservice.delete("/cookbooks")
+    >>> print(webservice.delete("/cookbooks"))
     HTTP/1.1 405 Method Not Allowed...
     Allow: GET POST
     ...
 
     >>> from urllib import quote
-    >>> print webservice.delete(quote("/dishes/Roast chicken"))
+    >>> print(webservice.delete(quote("/dishes/Roast chicken")))
     HTTP/1.1 405 Method Not Allowed...
     Allow: GET PUT PATCH
     ...
 
-    >>> print webservice.delete(quote("/cookbooks/The Joy of Cooking"))
+    >>> print(webservice.delete(quote("/cookbooks/The Joy of Cooking")))
     HTTP/1.1 405 Method Not Allowed...
     Allow: GET PUT PATCH POST
     ...
@@ -76,18 +76,18 @@
 An attempt to PATCH a document with unsupported media type to a
 resource yields a 415 error.
 
-    >>> print webservice.patch("/recipes/1", 'text/plain', "Foo")
+    >>> print(webservice.patch("/recipes/1", 'text/plain', "Foo"))
     HTTP/1.1 415 Unsupported Media Type
     ...
 
 The only supported media types are ones that begin with 'application/json'.
 
-    >>> print webservice.patch("/recipes/1", 'application/json', "{}")
+    >>> print(webservice.patch("/recipes/1", 'application/json', "{}"))
     HTTP/1.1 209 Content Returned
     ...
 
-    >>> print webservice.patch(
-    ...     "/recipes/1", 'application/json; charset=UTF-8', "{}")
+    >>> print(webservice.patch(
+    ...     "/recipes/1", 'application/json; charset=UTF-8', "{}"))
     HTTP/1.1 209 Content Returned
     ...
 

=== modified file 'src/lazr/restful/example/base/tests/test_integration.py'
--- src/lazr/restful/example/base/tests/test_integration.py	2018-09-28 15:34:25 +0000
+++ src/lazr/restful/example/base/tests/test_integration.py	2020-02-04 11:56:15 +0000
@@ -2,6 +2,8 @@
 
 """Test harness for LAZR doctests."""
 
+from __future__ import absolute_import, print_function
+
 __metaclass__ = type
 __all__ = []
 
@@ -45,7 +47,12 @@
         [name
          for name in os.listdir(os.path.dirname(__file__))
          if name.endswith('.txt')])
-    suite = doctest.DocFileSuite(optionflags=DOCTEST_FLAGS, *doctest_files)
+    globs = {
+        'absolute_import': absolute_import,
+        'print_function': print_function,
+        }
+    suite = doctest.DocFileSuite(
+        *doctest_files, optionflags=DOCTEST_FLAGS, globs=globs)
     suite.layer = WSGILayer
     tests.addTest(suite)
     return tests

=== modified file 'src/lazr/restful/example/base/tests/wadl.txt'
--- src/lazr/restful/example/base/tests/wadl.txt	2018-09-28 15:42:49 +0000
+++ src/lazr/restful/example/base/tests/wadl.txt	2020-02-04 11:56:15 +0000
@@ -21,7 +21,7 @@
 
 It's an XML document.
 
-    >>> print wadl
+    >>> print(wadl)
     <?xml version="1.0"?>
     <wadl:application xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xmlns="http://research.sun.com/wadl/2006/10"
@@ -180,7 +180,7 @@
 A cookbook starts out with no hosted cover, and an ordinary
 GET to the place where the cover would be results in a 404 error.
 
-    >>> print webservice.get(entry_url + '/cover')
+    >>> print(webservice.get(entry_url + '/cover'))
     HTTP/1.1 404 Not Found
     ...
 
@@ -264,17 +264,17 @@
     ...             if not isinstance(child, _Comment)]
 
     >>> service_doc, version_doc = children[:2]
-    >>> print service_doc.attrib['title']
+    >>> print(service_doc.attrib['title'])
     About this service
     >>> for p_tag in service_doc:
-    ...     print p_tag.text
+    ...     print(p_tag.text)
     This is a web service.
     It's got resources!
 
-    >>> print version_doc.attrib['title']
+    >>> print(version_doc.attrib['title'])
     About version devel
     >>> for p_tag in version_doc:
-    ...     print p_tag.text
+    ...     print(p_tag.text)
     The unstable development version.
     Don't use this unless you like changing things.
 
@@ -397,7 +397,7 @@
 
     >>> resources.tag
     '...resources'
-    >>> print resources.attrib['base']
+    >>> print(resources.attrib['base'])
     http://cookbooks.dev/devel/
 
 As with the <resources> tags shown earlier, this one contains a single
@@ -746,7 +746,7 @@
     >>> doc = copyright_date[0]
     >>> doc.tag
     '...doc'
-    >>> print "\n".join([node.text for node in doc])
+    >>> print("\n".join([node.text for node in doc]))
     Copyright Date
     The copyright date for this work.
 

=== modified file 'src/lazr/restful/example/base/traversal.py'
--- src/lazr/restful/example/base/traversal.py	2015-04-08 20:11:29 +0000
+++ src/lazr/restful/example/base/traversal.py	2020-02-04 11:56:15 +0000
@@ -2,6 +2,8 @@
 
 """Traversal rules for the LAZR example web service."""
 
+from __future__ import absolute_import, print_function
+
 __metaclass__ = type
 __all__ = [
     'BelowRootAbsoluteURL',

=== modified file 'src/lazr/restful/example/base_extended/README.txt'
--- src/lazr/restful/example/base_extended/README.txt	2010-08-05 13:12:00 +0000
+++ src/lazr/restful/example/base_extended/README.txt	2020-02-04 11:56:15 +0000
@@ -14,7 +14,7 @@
 
 And as we can see below, a recipe's representation now include its comments.
 
-    >>> print "\n".join(webservice.get('/recipes/1').jsonBody()['comments'])
+    >>> print("\n".join(webservice.get('/recipes/1').jsonBody()['comments']))
     Comment 1
     Comment 2
 

=== modified file 'src/lazr/restful/example/base_extended/comments.py'
--- src/lazr/restful/example/base_extended/comments.py	2016-02-17 01:07:21 +0000
+++ src/lazr/restful/example/base_extended/comments.py	2020-02-04 11:56:15 +0000
@@ -1,3 +1,5 @@
+from __future__ import absolute_import, print_function
+
 from zope.component import adapter
 from zope.interface import implementer, Interface
 from zope.schema import List, Text

=== modified file 'src/lazr/restful/example/base_extended/tests/test_integration.py'
--- src/lazr/restful/example/base_extended/tests/test_integration.py	2018-09-28 15:34:25 +0000
+++ src/lazr/restful/example/base_extended/tests/test_integration.py	2020-02-04 11:56:15 +0000
@@ -2,6 +2,8 @@
 
 """Test harness for LAZR doctests."""
 
+from __future__ import absolute_import, print_function
+
 __metaclass__ = type
 __all__ = []
 
@@ -33,7 +35,12 @@
 def load_tests(loader, tests, pattern):
     """See `zope.testing.testrunner`."""
     doctest_files = ['../README.txt']
-    suite = doctest.DocFileSuite(optionflags=DOCTEST_FLAGS, *doctest_files)
+    globs = {
+        'absolute_import': absolute_import,
+        'print_function': print_function,
+        }
+    suite = doctest.DocFileSuite(
+        *doctest_files, optionflags=DOCTEST_FLAGS, globs=globs)
     suite.layer = WSGILayer
     tests.addTest(suite)
     return tests

=== modified file 'src/lazr/restful/example/multiversion/resources.py'
--- src/lazr/restful/example/multiversion/resources.py	2016-02-17 01:07:21 +0000
+++ src/lazr/restful/example/multiversion/resources.py	2020-02-04 11:56:15 +0000
@@ -1,3 +1,5 @@
+from __future__ import absolute_import, print_function
+
 __metaclass__ = type
 
 __all__ = ['IKeyValuePair',

=== modified file 'src/lazr/restful/example/multiversion/root.py'
--- src/lazr/restful/example/multiversion/root.py	2010-08-18 15:33:46 +0000
+++ src/lazr/restful/example/multiversion/root.py	2020-02-04 11:56:15 +0000
@@ -1,5 +1,7 @@
 """The RESTful service root."""
 
+from __future__ import absolute_import, print_function
+
 __metaclass__ = type
 __all__ = [
     'BelowRootAbsoluteURL',

=== modified file 'src/lazr/restful/example/multiversion/tests/introduction.txt'
--- src/lazr/restful/example/multiversion/tests/introduction.txt	2011-02-01 00:57:27 +0000
+++ src/lazr/restful/example/multiversion/tests/introduction.txt	2020-02-04 11:56:15 +0000
@@ -19,22 +19,22 @@
 
     >>> top_level_response = webservice.get(
     ...     "/", api_version="beta").jsonBody()
-    >>> print top_level_response['key_value_pairs_collection_link']
+    >>> print(top_level_response['key_value_pairs_collection_link'])
     http://multiversion.dev/beta/pairs
 
     >>> top_level_response = webservice.get(
     ...     "/", api_version="1.0").jsonBody()
-    >>> print top_level_response['key_value_pairs_collection_link']
+    >>> print(top_level_response['key_value_pairs_collection_link'])
     http://multiversion.dev/1.0/pairs
 
     >>> top_level_response = webservice.get(
     ...     "/", api_version="2.0").jsonBody()
-    >>> print top_level_response['key_value_pairs_collection_link']
+    >>> print(top_level_response['key_value_pairs_collection_link'])
     http://multiversion.dev/2.0/pairs
 
     >>> top_level_response = webservice.get(
     ...     "/", api_version="3.0").jsonBody()
-    >>> print top_level_response['key_value_pairs_collection_link']
+    >>> print(top_level_response['key_value_pairs_collection_link'])
     http://multiversion.dev/3.0/pairs
 
 Like all web services, the multiversion service also serves a
@@ -46,7 +46,7 @@
 
     >>> top_level_response = webservice.get(
     ...     "/", api_version="trunk").jsonBody()
-    >>> print top_level_response['key_value_pairs_collection_link']
+    >>> print(top_level_response['key_value_pairs_collection_link'])
     http://multiversion.dev/trunk/pairs
 
 All versions of the web service can be accessed through Ajax.
@@ -55,16 +55,16 @@
     >>> ajax = WebServiceAjaxCaller(domain='multiversion.dev')
 
     >>> body = ajax.get('/', api_version="1.0").jsonBody()
-    >>> print body['resource_type_link']
+    >>> print(body['resource_type_link'])
     http://multiversion.dev/1.0/#service-root
 
     >>> body = ajax.get('/', api_version="trunk").jsonBody()
-    >>> print body['resource_type_link']
+    >>> print(body['resource_type_link'])
     http://multiversion.dev/trunk/#service-root
 
 An attempt to access a nonexistent version yields a 404 error.
 
-    >>> print webservice.get('/', api_version="no_such_version")
+    >>> print(webservice.get('/', api_version="no_such_version"))
     HTTP/1.1 404 Not Found
     ...
 
@@ -79,7 +79,7 @@
     >>> def show_pairs(version):
     ...     body = webservice.get('/pairs', api_version=version).jsonBody()
     ...     for entry in sorted(body['entries'], key=itemgetter('key')):
-    ...         print "%s: %s" % (entry['key'], entry['value'])
+    ...         print("%s: %s" % (entry['key'], entry['value']))
 
     >>> show_pairs('beta')
     1: 2
@@ -140,13 +140,13 @@
 
     >>> get_comment('1.0')
     u''
-    >>> print change_comment('I changed 1.0', '1.0')
+    >>> print(change_comment('I changed 1.0', '1.0'))
     I changed 1.0 (modified by mutator #1)
 
-    >>> print change_comment('I changed 2.0', '2.0')
+    >>> print(change_comment('I changed 2.0', '2.0'))
     I changed 2.0 (modified by mutator #1)
 
-    >>> print change_comment('I changed 3.0', '3.0')
+    >>> print(change_comment('I changed 3.0', '3.0'))
     I changed 3.0 (modified by mutator #2)
 
 You can try to modify the 'comment' field from a version that doesn't
@@ -154,7 +154,7 @@
 
     >>> change_comment('I changed beta', 'beta', False)
 
-    >>> print get_comment('1.0')
+    >>> print(get_comment('1.0'))
     I changed 3.0 (modified by mutator #2)
 
 A field called 'deleted' is published starting in version '3.0'. A
@@ -165,7 +165,7 @@
     ...     entry_body = webservice.get(
     ...         '/pairs/foo', api_version=version).jsonBody()
     ...     for key in sorted(entry_body.keys()):
-    ...         print key
+    ...         print(key)
 
     >>> show_fields('beta')
     a_comment
@@ -244,11 +244,11 @@
 If an entry field is not published in a certain version, the
 corresponding field resource does not exist for that version.
 
-    >>> print webservice.get('/pairs/foo/deleted', api_version='beta').body
+    >>> print(webservice.get('/pairs/foo/deleted', api_version='beta').body)
     Object: <...>, name: u'deleted'
 
-    >>> print webservice.get(
-    ...     '/pairs/foo/deleted', api_version='3.0').jsonBody()
+    >>> print(webservice.get(
+    ...     '/pairs/foo/deleted', api_version='3.0').jsonBody())
     False
 
 Named operations
@@ -267,12 +267,12 @@
 The named operation is not published at all in the 'beta' version of
 the web service.
 
-    >>> print show_value("beta", 'byValue')
+    >>> print(show_value("beta", 'byValue'))
     Traceback (most recent call last):
     ...
     ValueError: No such operation: byValue
 
-    >>> print show_value("beta", 'by_value')
+    >>> print(show_value("beta", 'by_value'))
     Traceback (most recent call last):
     ...
     ValueError: No such operation: by_value
@@ -280,12 +280,12 @@
 In the '1.0' and '2.0' versions, the named operation is published as
 'byValue'. 'by_value' does not work.
 
-    >>> print show_value("1.0", 'byValue')
+    >>> print(show_value("1.0", 'byValue'))
     foo
 
-    >>> print show_value("2.0", 'byValue')
+    >>> print(show_value("2.0", 'byValue'))
     foo
-    >>> print show_value("2.0", 'by_value')
+    >>> print(show_value("2.0", 'by_value'))
     Traceback (most recent call last):
     ...
     ValueError: No such operation: by_value
@@ -293,10 +293,10 @@
 In the '3.0' version, the named operation is published as
 'by_value'. 'byValue' does not work.
 
-    >>> print show_value("3.0", "by_value")
+    >>> print(show_value("3.0", "by_value"))
     foo
 
-    >>> print show_value("3.0", 'byValue')
+    >>> print(show_value("3.0", 'byValue'))
     Traceback (most recent call last):
     ...
     ValueError: No such operation: byValue
@@ -304,12 +304,12 @@
 In the 'trunk' version, the named operation has been removed. Neither
 'byValue' nor 'by_value' work.
 
-    >>> print show_value("trunk", 'byValue')
+    >>> print(show_value("trunk", 'byValue'))
     Traceback (most recent call last):
     ...
     ValueError: No such operation: byValue
 
-    >>> print show_value("trunk", 'by_value')
+    >>> print(show_value("trunk", 'by_value'))
     Traceback (most recent call last):
     ...
     ValueError: No such operation: by_value

=== modified file 'src/lazr/restful/example/multiversion/tests/operation.txt'
--- src/lazr/restful/example/multiversion/tests/operation.txt	2018-09-28 15:39:53 +0000
+++ src/lazr/restful/example/multiversion/tests/operation.txt	2020-02-04 11:56:15 +0000
@@ -21,7 +21,7 @@
     >>> from zope.component import getUtility
     >>> from lazr.restful.interfaces import IWebServiceConfiguration
     >>> config = getUtility(IWebServiceConfiguration)
-    >>> print config.first_version_with_total_size_link
+    >>> print(config.first_version_with_total_size_link)
     2.0
 
 When the 'byValue' operation is invoked in version 1.0, it always returns a
@@ -31,30 +31,30 @@
     ...     url = '/pairs?ws.op=%s&value=%s&ws.size=%s' % (op, value, size)
     ...     return webservice.get(url, api_version=version).jsonBody()
 
-    >>> print sorted(get_collection('1.0').keys())
+    >>> print(sorted(get_collection('1.0').keys()))
     [u'entries', u'next_collection_link', u'start', u'total_size']
 
 The operation itself doesn't change between 1.0 and 2.0, but in
 version 2.0, the operation starts returning total_size_link.
 
-    >>> print sorted(get_collection('2.0').keys())
+    >>> print(sorted(get_collection('2.0').keys()))
     [u'entries', u'next_collection_link', u'start', u'total_size_link']
 
 The same happens in 3.0.
 
-    >>> print sorted(get_collection('3.0', 'by_value').keys())
+    >>> print(sorted(get_collection('3.0', 'by_value').keys()))
     [u'entries', u'next_collection_link', u'start', u'total_size_link']
 
 However, if the total size is easy to calculate (for instance, because
 all the results fit on one page), a total_size is returned instead of
 total_size_link.
 
-    >>> print sorted(get_collection('3.0', 'by_value', size=100).keys())
+    >>> print(sorted(get_collection('3.0', 'by_value', size=100).keys()))
     [u'entries', u'start', u'total_size']
 
     >>> for key, value in sorted(
     ...         get_collection('3.0', 'by_value', 'no-such-value').items()):
-    ...     print '%s: %s' % (key, value)
+    ...     print('%s: %s' % (key, value))
     entries: []
     start: 0
     total_size: 0
@@ -69,7 +69,7 @@
 In the example web service, mutator methods are published as named
 operations in the 'beta' and '1.0' versions.
 
-    >>> print config.last_version_with_mutator_named_operations
+    >>> print(config.last_version_with_mutator_named_operations)
     1.0
 
 If you look at the definition of IKeyValuePair in
@@ -93,11 +93,11 @@
 
 In version 'beta', the 'a_comment' field has no mutator at all.
 
-    >>> print call_mutator("beta")
+    >>> print(call_mutator("beta"))
     HTTP/1.1 405 Method Not Allowed
     ...
 
-    >>> print call_mutator("beta", op="comment_mutator_2")
+    >>> print(call_mutator("beta", op="comment_mutator_2"))
     HTTP/1.1 405 Method Not Allowed
     ...
 
@@ -105,14 +105,14 @@
 'a_comment'. Because mutators are published as named operation in
 version '1.0', we can also invoke the mutator method directly.
 
-    >>> print call_mutator("1.0", "comment_mutator_1")
+    >>> print(call_mutator("1.0", "comment_mutator_1"))
     HTTP/1.1 200 Ok
     ...
 
 'comment_mutator_2' still doesn't work, because it's not the mutator
 for 'a_comment' in version '1.0'.
 
-    >>> print call_mutator("1.0", "comment_mutator_2")
+    >>> print(call_mutator("1.0", "comment_mutator_2"))
     HTTP/1.1 400 Bad Request
     ...
 
@@ -125,7 +125,7 @@
 for 'a_comment', but mutators are no longer published as named
 operations, so we can no longer invoke the mutator method directly.
 
-    >>> print call_mutator("2.0")
+    >>> print(call_mutator("2.0"))
     HTTP/1.1 405 Method Not Allowed
     ...
 
@@ -137,6 +137,6 @@
 for 'a_comment'. But since version '3.0' is after version '1.0', that
 method is not published as a named operation.
 
-    >>> print call_mutator("3.0", "comment_mutator_2")
+    >>> print(call_mutator("3.0", "comment_mutator_2"))
     HTTP/1.1 405 Method Not Allowed
     ...

=== modified file 'src/lazr/restful/example/multiversion/tests/test_integration.py'
--- src/lazr/restful/example/multiversion/tests/test_integration.py	2018-09-28 15:34:25 +0000
+++ src/lazr/restful/example/multiversion/tests/test_integration.py	2020-02-04 11:56:15 +0000
@@ -2,6 +2,8 @@
 
 """Test harness for doctests for lazr.restful multiversion example service."""
 
+from __future__ import absolute_import, print_function
+
 __metaclass__ = type
 __all__ = []
 
@@ -48,7 +50,12 @@
         [name
          for name in os.listdir(os.path.dirname(__file__))
          if name.endswith('.txt')])
-    suite = doctest.DocFileSuite(optionflags=DOCTEST_FLAGS, *doctest_files)
+    globs = {
+        'absolute_import': absolute_import,
+        'print_function': print_function,
+        }
+    suite = doctest.DocFileSuite(
+        *doctest_files, optionflags=DOCTEST_FLAGS, globs=globs)
     suite.layer = WSGILayer
     tests.addTest(suite)
     return tests

=== modified file 'src/lazr/restful/example/multiversion/tests/wadl.txt'
--- src/lazr/restful/example/multiversion/tests/wadl.txt	2010-08-05 14:08:20 +0000
+++ src/lazr/restful/example/multiversion/tests/wadl.txt	2020-02-04 11:56:15 +0000
@@ -40,10 +40,10 @@
 is not present at all.
 
     >>> contents = wadl_contents_for_version('beta')
-    >>> print contents['version_doc'].attrib['title']
+    >>> print(contents['version_doc'].attrib['title'])
     About version beta
 
-    >>> print contents['base'].attrib['base']
+    >>> print(contents['base'].attrib['base'])
     http://multiversion.dev/beta/
 
     >>> pair_collection = contents['pair_collection']
@@ -62,9 +62,9 @@
 In '2.0', the by_value method is called 'byValue'.
 
     >>> contents = wadl_contents_for_version('2.0')
-    >>> print contents['version_doc'].attrib['title']
+    >>> print(contents['version_doc'].attrib['title'])
     About version 2.0
-    >>> print contents['base'].attrib['base']
+    >>> print(contents['base'].attrib['base'])
     http://multiversion.dev/2.0/
 
     >>> pair_collection = contents['pair_collection']
@@ -74,9 +74,9 @@
 In '3.0', the method changes its name to 'by_value'.
 
     >>> contents = wadl_contents_for_version('3.0')
-    >>> print contents['version_doc'].attrib['title']
+    >>> print(contents['version_doc'].attrib['title'])
     About version 3.0
-    >>> print contents['base'].attrib['base']
+    >>> print(contents['base'].attrib['base'])
     http://multiversion.dev/3.0/
 
     >>> pair_collection = contents['pair_collection']
@@ -86,7 +86,7 @@
 In 'trunk', the method disappears.
 
     >>> contents = wadl_contents_for_version('trunk')
-    >>> print contents['base'].attrib['base']
+    >>> print(contents['base'].attrib['base'])
     http://multiversion.dev/trunk/
 
     >>> pair_collection = contents['pair_collection']

=== modified file 'src/lazr/restful/example/wsgi/resources.py'
--- src/lazr/restful/example/wsgi/resources.py	2016-02-17 01:07:21 +0000
+++ src/lazr/restful/example/wsgi/resources.py	2020-02-04 11:56:15 +0000
@@ -1,3 +1,5 @@
+from __future__ import absolute_import, print_function
+
 __metaclass__ = type
 
 __all__ = ['IKeyValuePair',

=== modified file 'src/lazr/restful/example/wsgi/root.py'
--- src/lazr/restful/example/wsgi/root.py	2010-02-25 17:07:16 +0000
+++ src/lazr/restful/example/wsgi/root.py	2020-02-04 11:56:15 +0000
@@ -1,5 +1,7 @@
 """The RESTful service root."""
 
+from __future__ import absolute_import, print_function
+
 __metaclass__ = type
 __all__ = [
     'BelowRootAbsoluteURL',

=== modified file 'src/lazr/restful/example/wsgi/run.py'
--- src/lazr/restful/example/wsgi/run.py	2009-09-03 19:42:04 +0000
+++ src/lazr/restful/example/wsgi/run.py	2020-02-04 11:56:15 +0000
@@ -1,4 +1,7 @@
 #!/usr/bin/python
+
+from __future__ import absolute_import, print_function
+
 from lazr.restful.wsgi import WSGIApplication
 
 if __name__ == '__main__':

=== modified file 'src/lazr/restful/example/wsgi/tests/introduction.txt'
--- src/lazr/restful/example/wsgi/tests/introduction.txt	2011-01-21 18:09:15 +0000
+++ src/lazr/restful/example/wsgi/tests/introduction.txt	2020-02-04 11:56:15 +0000
@@ -19,7 +19,7 @@
     >>> links = sorted([entry['self_link']
     ...                 for entry in collection_resource['entries']])
     >>> for link in links:
-    ...     print link
+    ...     print(link)
     http://wsgidemo.dev/1.0/1
     http://wsgidemo.dev/1.0/foo
 
@@ -32,5 +32,5 @@
 
 You can get a field resource.
 
-    >>> print webservice.get("/pairs/foo/value").jsonBody()
+    >>> print(webservice.get("/pairs/foo/value").jsonBody())
     bar

=== modified file 'src/lazr/restful/example/wsgi/tests/test_integration.py'
--- src/lazr/restful/example/wsgi/tests/test_integration.py	2018-09-28 15:34:25 +0000
+++ src/lazr/restful/example/wsgi/tests/test_integration.py	2020-02-04 11:56:15 +0000
@@ -2,6 +2,8 @@
 
 """Test harness for doctests for lazr.restful example WSGI service."""
 
+from __future__ import absolute_import, print_function
+
 __metaclass__ = type
 __all__ = []
 
@@ -45,7 +47,12 @@
         [name
          for name in os.listdir(os.path.dirname(__file__))
          if name.endswith('.txt')])
-    suite = doctest.DocFileSuite(optionflags=DOCTEST_FLAGS, *doctest_files)
+    globs = {
+        'absolute_import': absolute_import,
+        'print_function': print_function,
+        }
+    suite = doctest.DocFileSuite(
+        *doctest_files, optionflags=DOCTEST_FLAGS, globs=globs)
     suite.layer = WSGILayer
     tests.addTest(suite)
     return tests

=== modified file 'src/lazr/restful/fields.py'
--- src/lazr/restful/fields.py	2016-02-17 01:07:21 +0000
+++ src/lazr/restful/fields.py	2020-02-04 11:56:15 +0000
@@ -2,6 +2,8 @@
 
 """LAZR zope.schema.IField implementation."""
 
+from __future__ import absolute_import, print_function
+
 __metaclass__ = type
 __all__ = [
     'CollectionField',

=== modified file 'src/lazr/restful/interface.py'
--- src/lazr/restful/interface.py	2009-03-26 17:25:22 +0000
+++ src/lazr/restful/interface.py	2020-02-04 11:56:15 +0000
@@ -2,6 +2,8 @@
 
 """Helpers for working with Zope interface."""
 
+from __future__ import absolute_import, print_function
+
 __metaclass__ = type
 __all__ = [
         'copy_attribute',

=== modified file 'src/lazr/restful/interfaces/__init__.py'
--- src/lazr/restful/interfaces/__init__.py	2009-03-26 17:25:22 +0000
+++ src/lazr/restful/interfaces/__init__.py	2020-02-04 11:56:15 +0000
@@ -17,6 +17,8 @@
 
 # pylint: disable-msg=W0401
 
+from __future__ import absolute_import, print_function
+
 __version__ = 1.0
 
 # Re-export in such a way that __version__ can still be imported if

=== modified file 'src/lazr/restful/interfaces/_fields.py'
--- src/lazr/restful/interfaces/_fields.py	2011-01-19 22:29:32 +0000
+++ src/lazr/restful/interfaces/_fields.py	2020-02-04 11:56:15 +0000
@@ -16,6 +16,8 @@
 
 """Interfaces for LAZR zope.schema fields."""
 
+from __future__ import absolute_import, print_function
+
 __metaclass__ = type
 __all__ = [
     'ICollectionField',

=== modified file 'src/lazr/restful/interfaces/_rest.py'
--- src/lazr/restful/interfaces/_rest.py	2011-03-31 01:13:59 +0000
+++ src/lazr/restful/interfaces/_rest.py	2020-02-04 11:56:15 +0000
@@ -18,6 +18,8 @@
 # Pylint doesn't grok zope interfaces.
 # pylint: disable-msg=E0211,E0213
 
+from __future__ import absolute_import, print_function
+
 __metaclass__ = type
 __all__ = [
     'IByteStorage',

=== modified file 'src/lazr/restful/jsoncache.py'
--- src/lazr/restful/jsoncache.py	2016-02-17 01:07:21 +0000
+++ src/lazr/restful/jsoncache.py	2020-02-04 11:56:15 +0000
@@ -2,6 +2,8 @@
 #
 """A class for storing resources where they can be seen by a template."""
 
+from __future__ import absolute_import, print_function
+
 __metaclass__ = type
 
 __all__ = [

=== modified file 'src/lazr/restful/marshallers.py'
--- src/lazr/restful/marshallers.py	2018-11-15 15:29:42 +0000
+++ src/lazr/restful/marshallers.py	2020-02-04 11:56:15 +0000
@@ -2,6 +2,8 @@
 
 """Marshallers for fields used in HTTP resources."""
 
+from __future__ import absolute_import, print_function
+
 __metaclass__ = type
 __all__ = [
     'AbstractCollectionFieldMarshaller',

=== modified file 'src/lazr/restful/metazcml.py'
--- src/lazr/restful/metazcml.py	2019-11-04 13:51:46 +0000
+++ src/lazr/restful/metazcml.py	2020-02-04 11:56:15 +0000
@@ -2,6 +2,8 @@
 
 """ZCML registration directives for the LAZR webservice framework."""
 
+from __future__ import absolute_import, print_function
+
 __metaclass__ = type
 __all__ = []
 

=== modified file 'src/lazr/restful/publisher.py'
--- src/lazr/restful/publisher.py	2019-11-04 17:35:37 +0000
+++ src/lazr/restful/publisher.py	2020-02-04 11:56:15 +0000
@@ -6,6 +6,8 @@
 with the Zope publisher.
 """
 
+from __future__ import absolute_import, print_function
+
 __metaclass__ = type
 __all__ = [
     'browser_request_to_web_service_request',

=== modified file 'src/lazr/restful/security.py'
--- src/lazr/restful/security.py	2009-03-26 17:25:22 +0000
+++ src/lazr/restful/security.py	2020-02-04 11:56:15 +0000
@@ -2,6 +2,8 @@
 
 """Utilities for dealing with zope security."""
 
+from __future__ import absolute_import, print_function
+
 __metaclass__ = type
 __all__ = [
     'protect_schema',

=== modified file 'src/lazr/restful/simple.py'
--- src/lazr/restful/simple.py	2016-02-17 01:07:21 +0000
+++ src/lazr/restful/simple.py	2020-02-04 11:56:15 +0000
@@ -1,5 +1,7 @@
 """Simple implementations of various Zope and lazr.restful interfaces."""
 
+from __future__ import absolute_import, print_function
+
 __metaclass__ = type
 __all__ = [
     'BaseRepresentationCache',

=== modified file 'src/lazr/restful/tales.py'
--- src/lazr/restful/tales.py	2018-02-21 14:46:13 +0000
+++ src/lazr/restful/tales.py	2020-02-04 11:56:15 +0000
@@ -2,6 +2,8 @@
 #
 """Implementation of the ws: namespace in TALES."""
 
+from __future__ import absolute_import, print_function
+
 __metaclass__ = type
 
 all = ['entry_adapter_for_schema']

=== modified file 'src/lazr/restful/testing/event.py'
--- src/lazr/restful/testing/event.py	2009-04-02 15:44:00 +0000
+++ src/lazr/restful/testing/event.py	2020-02-04 11:56:15 +0000
@@ -2,6 +2,8 @@
 
 """Helper class for checking the event notifications."""
 
+from __future__ import absolute_import, print_function
+
 __metaclass__ = type
 
 import zope.component

=== modified file 'src/lazr/restful/testing/helpers.py'
--- src/lazr/restful/testing/helpers.py	2016-02-17 01:07:21 +0000
+++ src/lazr/restful/testing/helpers.py	2020-02-04 11:56:15 +0000
@@ -1,3 +1,5 @@
+from __future__ import absolute_import, print_function
+
 import sys
 from types import ModuleType
 

=== modified file 'src/lazr/restful/testing/tales.py'
--- src/lazr/restful/testing/tales.py	2019-11-12 14:26:41 +0000
+++ src/lazr/restful/testing/tales.py	2020-02-04 11:56:15 +0000
@@ -2,6 +2,8 @@
 
 """Helper functions for testing TALES expressions."""
 
+from __future__ import absolute_import, print_function
+
 __metaclass__ = type
 
 __all__ = [

=== modified file 'src/lazr/restful/testing/webservice.py'
--- src/lazr/restful/testing/webservice.py	2016-02-17 01:07:21 +0000
+++ src/lazr/restful/testing/webservice.py	2020-02-04 11:56:15 +0000
@@ -2,6 +2,8 @@
 
 """Testing helpers for webservice unit tests."""
 
+from __future__ import absolute_import, print_function
+
 __metaclass__ = type
 __all__ = [
     'create_web_service_request',
@@ -176,7 +178,7 @@
     """
     for key, value in sorted(json_body.items()):
         if key != 'http_etag':
-            print '%s: %r' % (key, value)
+            print('%s: %r' % (key, value))
 
 
 def pprint_collection(json_body):
@@ -185,11 +187,11 @@
         if key == 'total_size_link':
             continue
         if key != 'entries':
-            print '%s: %r' % (key, value)
-    print '---'
+            print('%s: %r' % (key, value))
+    print('---')
     for entry in json_body['entries']:
         pprint_entry(entry)
-        print '---'
+        print('---')
 
 
 class WebServiceTestPublication(Publication):

=== modified file 'src/lazr/restful/tests/test_declarations.py'
--- src/lazr/restful/tests/test_declarations.py	2019-11-04 17:35:37 +0000
+++ src/lazr/restful/tests/test_declarations.py	2020-02-04 11:56:15 +0000
@@ -2,6 +2,8 @@
 
 """Unit tests for the conversion of interfaces into a web service."""
 
+from __future__ import absolute_import, print_function
+
 import testtools
 from zope.component import (
     adapter,

=== modified file 'src/lazr/restful/tests/test_docs.py'
--- src/lazr/restful/tests/test_docs.py	2019-11-04 09:54:43 +0000
+++ src/lazr/restful/tests/test_docs.py	2020-02-04 11:56:15 +0000
@@ -17,6 +17,8 @@
 
 # pylint: disable=E0611,W0142
 
+from __future__ import absolute_import, print_function
+
 __metaclass__ = type
 __all__ = []
 
@@ -50,7 +52,11 @@
                     os.path.abspath(
                         resource_filename('lazr.restful', 'docs/%s' % name)))
     atexit.register(cleanup_resources)
+    globs = {
+        'absolute_import': absolute_import,
+        'print_function': print_function,
+        }
     tests.addTest(doctest.DocFileSuite(
         *doctest_files, module_relative=False, optionflags=DOCTEST_FLAGS,
-        tearDown=tearDown))
+        tearDown=tearDown, globs=globs))
     return tests

=== modified file 'src/lazr/restful/tests/test_error.py'
--- src/lazr/restful/tests/test_error.py	2018-09-28 15:34:25 +0000
+++ src/lazr/restful/tests/test_error.py	2020-02-04 11:56:15 +0000
@@ -2,6 +2,8 @@
 
 """Tests of lazr.restful navigation."""
 
+from __future__ import absolute_import, print_function
+
 __metaclass__ = type
 
 from pkg_resources import resource_filename

=== modified file 'src/lazr/restful/tests/test_etag.py'
--- src/lazr/restful/tests/test_etag.py	2016-02-17 00:49:58 +0000
+++ src/lazr/restful/tests/test_etag.py	2020-02-04 11:56:15 +0000
@@ -1,6 +1,8 @@
 # Copyright 2008 Canonical Ltd.  All rights reserved.
 """Tests for ETag generation."""
 
+from __future__ import absolute_import, print_function
+
 __metaclass__ = type
 
 import unittest

=== modified file 'src/lazr/restful/tests/test_navigation.py'
--- src/lazr/restful/tests/test_navigation.py	2018-09-28 15:34:25 +0000
+++ src/lazr/restful/tests/test_navigation.py	2020-02-04 11:56:15 +0000
@@ -2,6 +2,8 @@
 
 """Tests of lazr.restful navigation."""
 
+from __future__ import absolute_import, print_function
+
 __metaclass__ = type
 
 import unittest

=== modified file 'src/lazr/restful/tests/test_utils.py'
--- src/lazr/restful/tests/test_utils.py	2011-03-17 13:45:53 +0000
+++ src/lazr/restful/tests/test_utils.py	2020-02-04 11:56:15 +0000
@@ -2,6 +2,8 @@
 
 """Test for lazr.restful.utils."""
 
+from __future__ import absolute_import, print_function
+
 __metaclass__ = type
 
 import random

=== modified file 'src/lazr/restful/tests/test_webservice.py'
--- src/lazr/restful/tests/test_webservice.py	2018-09-28 15:46:57 +0000
+++ src/lazr/restful/tests/test_webservice.py	2020-02-04 11:56:15 +0000
@@ -2,6 +2,8 @@
 
 """Test for the WADL generation."""
 
+from __future__ import absolute_import, print_function
+
 __metaclass__ = type
 
 from contextlib import contextmanager

=== modified file 'src/lazr/restful/utils.py'
--- src/lazr/restful/utils.py	2011-03-21 14:00:50 +0000
+++ src/lazr/restful/utils.py	2020-02-04 11:56:15 +0000
@@ -2,6 +2,8 @@
 
 """Various utility functions."""
 
+from __future__ import absolute_import, print_function
+
 __metaclass__ = type
 __all__ = [
     'camelcase_to_underscore_separated',

=== modified file 'src/lazr/restful/wsgi.py'
--- src/lazr/restful/wsgi.py	2015-04-08 20:11:29 +0000
+++ src/lazr/restful/wsgi.py	2020-02-04 11:56:15 +0000
@@ -1,5 +1,7 @@
 """A WSGI application for a lazr.restful web service."""
 
+from __future__ import absolute_import, print_function
+
 __metaclass__ = type
 __all__ = [
     'BaseWSGIWebServiceConfiguration',