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

[Colin Watson]

Handle renaming of __builtin__ to builtins in Python 3.

[Thiago F. Pappacena (pappacena)]

LGTM

review: Approve

=== modified file 'src/lazr/restful/debug.py'
--- src/lazr/restful/debug.py	2020-02-04 11:52:59 +0000
+++ src/lazr/restful/debug.py	2020-09-02 15:47:29 +0000
@@ -20,7 +20,7 @@
 def typename(obj):
     """Return the typename of an object."""
     t = type(obj)
-    if t.__module__ == '__builtin__':
+    if t.__module__ in {'__builtin__', 'builtins'}:
         return t.__name__
     else:
         return "%s.%s" % (t.__module__, t.__name__)

=== modified file 'src/lazr/restful/docs/webservice-declarations.rst'
--- src/lazr/restful/docs/webservice-declarations.rst	2020-08-21 16:16:09 +0000
+++ src/lazr/restful/docs/webservice-declarations.rst	2020-09-02 15:47:29 +0000
@@ -891,8 +891,10 @@
 The created interface is named with 'Entry' appended to the original
 name, and is in the same module
 
-    >>> entry_interface.__module__
-    '__builtin__'
+    >>> import sys
+    >>> entry_interface.__module__ == (
+    ...     'builtins' if sys.version_info[0] >= 3 else '__builtin__')
+    True
     >>> entry_interface.__name__
     'IBookEntry_beta'
 

=== modified file 'src/lazr/restful/tests/test_docs.py'
--- src/lazr/restful/tests/test_docs.py	2020-08-21 16:16:09 +0000
+++ src/lazr/restful/tests/test_docs.py	2020-09-02 15:47:29 +0000
@@ -25,6 +25,8 @@
 import atexit
 import doctest
 import os
+import re
+
 from pkg_resources import (
     resource_filename, resource_exists, resource_listdir, cleanup_resources)
 from zope.testing import renormalizing
@@ -37,7 +39,9 @@
     doctest.REPORT_NDIFF)
 
 
-checker = renormalizing.OutputChecker()
+checker = renormalizing.OutputChecker([
+    (re.compile(r'__builtin__\.'), 'builtins.'),
+    ])
 
 
 def tearDown(test):