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

[Colin Watson]

Port lazr.restful.tests.test_webservice.make_entry to Python 3.

Python 3 has no exec statement. We could have switched to the "exec(code)" form, which works in both Python 2 and 3; but this is a good opportunity to switch to constructing the class dynamically without "exec", which seems more elegant.

[Thiago F. Pappacena (pappacena)]

LGTM

review: Approve

=== modified file 'src/lazr/restful/tests/test_webservice.py'
--- src/lazr/restful/tests/test_webservice.py	2020-09-02 22:26:24 +0000
+++ src/lazr/restful/tests/test_webservice.py	2020-09-03 18:39:07 +0000
@@ -13,7 +13,6 @@
     )
 from lxml import etree
 from operator import attrgetter
-from textwrap import dedent
 import collections
 import logging
 import random
@@ -28,6 +27,7 @@
     getUtility,
     )
 from zope.interface import implementer, Interface
+from zope.interface.interface import InterfaceClass
 from zope.publisher.browser import TestRequest
 from zope.schema import Choice, Date, Datetime, TextLine
 from zope.schema.interfaces import ITextLine
@@ -773,19 +773,11 @@
 
 def make_entry(name):
     """Make an entity with some attibutes to expose as a web service."""
-    code = """
-        @exported_as_webservice_entry(singular_name='%(name)s')
-        class %(name)s(Interface):
-            pass
-        """ % locals()
-
-    for letter in 'rstuvwxyz':
-        code += """
-            %(letter)s_field = exported(TextLine(title=u'Field %(letter)s'))
-            """ % locals()
-
-    exec dedent(code)
-    return locals()[name]
+    fields = {
+        '%s_field' % letter: exported(TextLine(title=u'Field %s' % letter))
+        for letter in 'rstuvwxyz'}
+    cls = InterfaceClass(name, bases=(Interface,), attrs=fields)
+    return exported_as_webservice_entry(singular_name=name)(cls)
 
 
 class TestWadlDeterminism(WebServiceTestCase):