Merge ~cjwatson/lazr.restful:fix-more-flake8 into lazr.restful:main

[Colin Watson]

Fix several more problems noticed by flake8

[Ioana Lasc (ilasc)]

review: Approve

diff --git a/src/lazr/restful/metazcml.py b/src/lazr/restful/metazcml.py
index 4e7ec93..1fe9422 100644
--- a/src/lazr/restful/metazcml.py
+++ b/src/lazr/restful/metazcml.py
@@ -263,9 +263,15 @@ def find_exported_interfaces(module):
     """
     try:
         module_all = set(module.__all__)
-        is_exported_name = lambda name: name in module_all
+
+        def is_exported_name(name):
+            return name in module_all
+
     except AttributeError:
-        is_exported_name = lambda name: not name.startswith("_")
+
+        def is_exported_name(name):
+            return not name.startswith("_")
+
     return (
         interface
         for name, interface in inspect.getmembers(
diff --git a/src/lazr/restful/tales.py b/src/lazr/restful/tales.py
index 24d7e45..2968667 100644
--- a/src/lazr/restful/tales.py
+++ b/src/lazr/restful/tales.py
@@ -378,14 +378,6 @@ class WadlEntryResourceAPI(WadlResourceAPI):
     def type_link(self):
         return self.resource.type_url
 
-    @property
-    def fields_with_values(self):
-        """Return all of this entry's Field objects."""
-        fields = []
-        for name, field in getFieldsInOrder(self.schema):
-            fields.append({"field": field, "value": "foo"})
-        return fields
-
 
 class WadlCollectionResourceAPI(WadlResourceAPI):
     "Namespace for WADL functions that operate on collection resources."
diff --git a/src/lazr/restful/tests/test_error.py b/src/lazr/restful/tests/test_error.py
index b667dbc..d407ccb 100644
--- a/src/lazr/restful/tests/test_error.py
+++ b/src/lazr/restful/tests/test_error.py
@@ -17,9 +17,13 @@ from zope.component import getGlobalSiteManager
 from zope.interface import Interface
 
 from lazr.restful.declarations import error_status
-from lazr.restful._resource import ReadWriteResource, UnknownEntryAdapter
+from lazr.restful._resource import (
+    EntryAdapterUtility,
+    ReadWriteResource,
+    UnknownEntryAdapter,
+)
 from lazr.restful.error import expose
-from lazr.restful.interfaces import IWebServiceLayer
+from lazr.restful.interfaces import IWebServiceLayer, IWebServiceVersion
 from lazr.restful.testing.webservice import FakeRequest
 
 
@@ -187,21 +191,35 @@ class ErrorsTestCase(unittest.TestCase):
     def test_missing_adapter(self):
         # If there is no multi-adapter from the entry interface (IMyEntry) and
         # a request to IEntry an exception is raised.
+        class IWebServiceTestRequestBeta(IWebServiceVersion):
+            pass
+
         class IMyEntry(Interface):
             pass
 
+        sm = getGlobalSiteManager()
+        sm.registerUtility(
+            IWebServiceTestRequestBeta, IWebServiceVersion, name="beta"
+        )
+        self.addCleanup(
+            sm.unregisterUtility,
+            IWebServiceTestRequestBeta,
+            IWebServiceVersion,
+            name="beta",
+        )
+        beta_request = FakeRequest(version="beta")
         # Since the test wants to inspect the exception message (below) we're
         # not using self.assertRaises).
         try:
-            EntryAdapterUtility.forSchemaInterface(IMyEntry, self.beta_request)
+            EntryAdapterUtility.forSchemaInterface(IMyEntry, beta_request)
         except Exception as e:
             self.assertTrue(isinstance(e, Exception))
 
             # The exception's message explains what went wrong.
-            self.assertTrue(
-                str(e),
+            self.assertEqual(
                 "No IEntry adapter found for IMyEntry "
                 "(web service version: beta).",
+                str(e),
             )
         else:
             self.fail(
diff --git a/src/lazr/restful/tests/test_webservice.py b/src/lazr/restful/tests/test_webservice.py
index 399866a..4864150 100644
--- a/src/lazr/restful/tests/test_webservice.py
+++ b/src/lazr/restful/tests/test_webservice.py
@@ -179,15 +179,11 @@ class EntryTestCase(WebServiceTestCase):
             return request.publication.application.toWADL()
 
     @contextmanager
-    def entry_resource(
-        self, entry_interface, entry_implementation, *implementation_args
-    ):
+    def entry_resource(self, entry_implementation, *implementation_args):
         """Create a request to an entry resource, and yield the resource."""
-        entry_class = get_resource_factory(entry_interface, IEntry)
         data_object = entry_implementation(*implementation_args)
 
         with self.request() as request:
-            entry = entry_class(data_object, request)
             resource = EntryResource(data_object, request)
             yield resource
 
@@ -305,7 +301,7 @@ class TestEntryWebLink(EntryTestCase):
 
         # Now a representation of IHasOneField includes a
         # 'web_link'.
-        with self.entry_resource(IHasOneField, HasOneField, "") as resource:
+        with self.entry_resource(HasOneField, "") as resource:
             representation = resource.toDataForJSON()
             self.assertEqual(representation["self_link"], StubAbsoluteURL.URL)
             self.assertEqual(
@@ -340,7 +336,7 @@ class TestEntryWebLink(EntryTestCase):
         # entry representations.
         self._register_url_adapter(IHasOneField)
 
-        with self.entry_resource(IHasOneField, HasOneField, "") as resource:
+        with self.entry_resource(HasOneField, "") as resource:
             representation = resource.toDataForJSON()
             self.assertEqual(representation["self_link"], StubAbsoluteURL.URL)
             self.assertFalse("web_link" in representation)
@@ -376,9 +372,7 @@ class TestSuppressWebLink(EntryTestCase):
     def test_entry_omits_web_link_when_suppressed(self):
         self._register_website_url_space(IHasNoWebLink)
 
-        with self.entry_resource(IHasNoWebLink, HasNoWebLink, "") as (
-            resource
-        ):
+        with self.entry_resource(HasNoWebLink, "") as resource:
             representation = resource.toDataForJSON()
             self.assertEqual(representation["self_link"], StubAbsoluteURL.URL)
             self.assertFalse("web_link" in representation)
@@ -442,7 +436,7 @@ class TestEntryWrite(EntryTestCase):
     def test_applyChanges_rejects_nonexistent_web_link(self):
         # If web_link is not published, applyChanges rejects a request
         # that references it.
-        with self.entry_resource(IHasOneField, HasOneField, "") as resource:
+        with self.entry_resource(HasOneField, "") as resource:
             errors = resource.applyChanges({"web_link": u"some_value"})
             self.assertEqual(
                 errors,
@@ -453,7 +447,7 @@ class TestEntryWrite(EntryTestCase):
         """applyChanges rejects an attempt to change web_link ."""
         self._register_website_url_space(IHasOneField)
 
-        with self.entry_resource(IHasOneField, HasOneField, "") as resource:
+        with self.entry_resource(HasOneField, "") as resource:
             errors = resource.applyChanges({"web_link": u"some_value"})
             self.assertEqual(
                 errors, "web_link: You tried to modify a read-only attribute."
@@ -464,7 +458,7 @@ class TestEntryWrite(EntryTestCase):
         # value isn't actually being changed.
         self._register_website_url_space(IHasOneField)
 
-        with self.entry_resource(IHasOneField, HasOneField, "") as resource:
+        with self.entry_resource(HasOneField, "") as resource:
             existing_web_link = resource.toDataForJSON()["web_link"]
             representation = simplejson.loads(
                 resource.applyChanges({"web_link": existing_web_link})
@@ -476,7 +470,7 @@ class TestEntryWrite(EntryTestCase):
         # representation of the (unchanged) resource.
         self._register_website_url_space(IHasOneField)
 
-        with self.entry_resource(IHasOneField, HasOneField, "") as resource:
+        with self.entry_resource(HasOneField, "") as resource:
             existing_representation = resource.toDataForJSON()
             representation = simplejson.loads(resource.applyChanges({}))
             self.assertEqual(representation, existing_representation)
@@ -489,7 +483,6 @@ class TestEntryWrite(EntryTestCase):
         self._register_website_url_space(IHasFieldExportedAsDifferentName)
 
         with self.entry_resource(
-            IHasFieldExportedAsDifferentName,
             HasFieldExportedAsDifferentName,
             u"initial value",
         ) as resource:
@@ -521,9 +514,7 @@ class TestEntryWriteForRestrictedField(EntryTestCase):
         expose the right interface, it will raise an exception.
         """
         self._register_url_adapter(IHasRestrictedField)
-        with self.entry_resource(
-            IHasRestrictedField, HasRestrictedField, ""
-        ) as resource:
+        with self.entry_resource(HasRestrictedField, "") as resource:
             entry = resource.entry
             entry.schema["a_field"].restrict_to_interface = IHasRestrictedField
             self.assertEqual(entry.a_field, "")
@@ -558,7 +549,7 @@ class HTMLRepresentationTest(EntryTestCase):
 
     def test_entry_html_representation_is_utf8(self):
         with self.entry_resource(
-            IHasOneField, HasOneField, self.unicode_message
+            HasOneField, self.unicode_message
         ) as resource:
             html = resource.do_GET()
             self.assertTrue(self.utf8_message in html)
@@ -592,7 +583,6 @@ class JSONPlusHTMLRepresentationTest(EntryTestCase):
     def resource(self, value_1="value 1", value_2="value 2"):
         """Simplify the entry_resource call."""
         with self.entry_resource(
-            IHasTwoFields,
             HasTwoFields,
             six.text_type(value_1),
             six.text_type(value_2),
@@ -721,9 +711,7 @@ class UnicodeErrorTestCase(EntryTestCase):
         self._register_url_adapter(ICanBeSetToUnicodeValue)
 
     def test_unicode_error(self):
-        with self.entry_resource(
-            ICanBeSetToUnicodeValue, CanBeSetToUnicodeValue, ""
-        ) as resource:
+        with self.entry_resource(CanBeSetToUnicodeValue, "") as resource:
 
             # This will raise an exception, which will cause the request
             # to fail with a 400 error code.
@@ -1135,7 +1123,7 @@ class NotificationsProviderTest(EntryTestCase):
     @contextmanager
     def resource(self):
         """Simplify the entry_resource call."""
-        with self.entry_resource(IHasOneField, HasOneField, "") as resource:
+        with self.entry_resource(HasOneField, "") as resource:
             yield resource
 
     def test_response_notifications(self):
@@ -1165,7 +1153,7 @@ class EventTestCase(EntryTestCase):
     def test_event_fired_when_changeset_is_not_empty(self):
         # Passing in a non-empty changeset spawns an
         # IObjectModifiedEvent.
-        with self.entry_resource(IHasOneField, HasOneField, "") as resource:
+        with self.entry_resource(HasOneField, "") as resource:
             resource.applyChanges({"a_field": u"Some value"})
         events = eventtesting.getEvents()
         self.assertEqual(len(events), 1)
@@ -1176,7 +1164,7 @@ class EventTestCase(EntryTestCase):
     def test_event_not_fired_when_changeset_is_empty(self):
         # Passing in an empty changeset does not spawn an
         # IObjectModifiedEvent.
-        with self.entry_resource(IHasOneField, HasOneField, "") as resource:
+        with self.entry_resource(HasOneField, "") as resource:
             resource.applyChanges({})
         self.assertEqual(len(eventtesting.getEvents()), 0)
 
@@ -1193,7 +1181,7 @@ class MalformedRequest(EntryTestCase):
 
     def test_multiple_named_operations_generate_error_on_GET(self):
         with self.entry_resource(
-            IHasOneField, HasOneField, self.unicode_message
+            HasOneField, self.unicode_message
         ) as resource:
             resource.request.form["ws.op"] = ["foo", "bar"]
             result = resource.do_GET()
@@ -1202,7 +1190,7 @@ class MalformedRequest(EntryTestCase):
 
     def test_multiple_named_operations_generate_error_on_POST(self):
         with self.entry_resource(
-            IHasOneField, HasOneField, self.unicode_message
+            HasOneField, self.unicode_message
         ) as resource:
             resource.request.form["ws.op"] = ["foo", "bar"]
             result = resource.do_POST()
diff --git a/tox.ini b/tox.ini
index 8ea8d6d..4030fe5 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,14 @@
 [tox]
 envlist =
-    py27,py35,py36,py37,py38,py39,py310,docs
+    lint
+    py27
+    py35
+    py36
+    py37
+    py38
+    py39
+    py310
+    docs
 
 [testenv]
 deps =
@@ -9,6 +17,14 @@ deps =
 commands =
     zope-testrunner --test-path src --tests-pattern ^tests {posargs}
 
+[testenv:lint]
+basepython = python3.8
+deps =
+    pre-commit
+skip_install = true
+commands =
+    pre-commit run -a
+
 [testenv:docs]
 basepython = python3
 deps =
@@ -23,8 +39,3 @@ ignore =
     # W503 and W504 are mutually exclusive
     W503
     W504
-    # todo
-    E731
-    F821
-    F841
-    W605