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

[Colin Watson]

Handle dict method changes in Python 3.

[William Grant (wgrant)]

review: Approve (code)

=== modified file 'src/lazr/restful/_resource.py'
--- src/lazr/restful/_resource.py	2020-06-30 15:52:03 +0000
+++ src/lazr/restful/_resource.py	2020-07-22 23:32:54 +0000
@@ -1221,7 +1221,7 @@
             # The changeset contained new values for some of this object's
             # fields, and the notification event may have changed others.
             # Clear out any fields that changed.
-            for name, cached in self._unmarshalled_field_cache.items():
+            for name, cached in list(self._unmarshalled_field_cache.items()):
                 cached, (field, old_value, flag) = cached
                 if flag is IUnmarshallingDoesntNeedValue:
                     continue
@@ -1986,14 +1986,14 @@
                         schema, self.request)
 
                     singular = adapter.singular_type
-                    assert not singular_names.has_key(singular), (
+                    assert singular not in singular_names, (
                         "Both %s and %s expose the singular name '%s'."
                         % (singular_names[singular].__name__,
                            schema.__name__, singular))
                     singular_names[singular] = schema
 
                     plural = adapter.plural_type
-                    assert not plural_names.has_key(plural), (
+                    assert plural not in plural_names, (
                         "Both %s and %s expose the plural name '%s'."
                         % (plural_names[plural].__name__,
                            schema.__name__, plural))
 
=== modified file 'src/lazr/restful/declarations.py'
--- src/lazr/restful/declarations.py	2020-02-05 10:46:46 +0000
+++ src/lazr/restful/declarations.py	2020-07-22 23:32:54 +0000
@@ -405,7 +405,7 @@
     # If any keywords are left over, raise an exception.
     if len(kwparams) > 0:
         raise TypeError("exported got an unexpected keyword "
-                        "argument '%s'" % kwparams.keys()[0])
+                        "argument '%s'" % list(kwparams)[0])
 
     # Now incorporate the list of named dicts into the VersionedDict.
     for version, annotations in reversed(versioned_annotations):
@@ -1254,7 +1254,7 @@
     # Go through the fields and build up a picture of what this entry looks
     # like for every version.
     adapters_by_version = {}
-    fields = getFields(content_interface).items()
+    fields = list(getFields(content_interface).items())
     for version, iface in webservice_interfaces:
         fields.extend(getFields(iface).items())
     for name, field in fields:
 
=== modified file 'src/lazr/restful/docs/webservice-declarations.rst'
--- src/lazr/restful/docs/webservice-declarations.rst	2020-06-30 13:33:53 +0000
+++ src/lazr/restful/docs/webservice-declarations.rst	2020-07-22 23:32:54 +0000
@@ -2352,7 +2352,7 @@
 
     >>> attrs['params']['arg']
     <zope.schema._field.Float object...>
-    >>> attrs['params'].keys()
+    >>> list(attrs['params'])
     ['arg']
 
     >>> attrs['return_type']
 
=== modified file 'src/lazr/restful/docs/webservice-marshallers.rst'
--- src/lazr/restful/docs/webservice-marshallers.rst	2020-06-30 15:52:03 +0000
+++ src/lazr/restful/docs/webservice-marshallers.rst	2020-07-22 23:32:54 +0000
@@ -928,7 +928,7 @@
     ['Dessert', 'Vegetarian']
 
     >>> unmarshalled = dict_marshaller.unmarshall(None, marshalled_dict)
-    >>> sorted(unmarshalled.iteritems())
+    >>> sorted(unmarshalled.items())
     [(u'bar', 'General'), (u'foo', 'Vegetarian')]
 
 The unmarshall() method will return None when given None.
 
=== modified file 'src/lazr/restful/docs/webservice.rst'
--- src/lazr/restful/docs/webservice.rst	2020-02-04 13:17:32 +0000
+++ src/lazr/restful/docs/webservice.rst	2020-07-22 23:32:54 +0000
@@ -652,10 +652,9 @@
     >>> from lazr.restful import Entry
     >>> from lazr.restful.testing.webservice import FakeRequest
 
-    >>> from UserDict import UserDict
-    >>> class FakeDict(UserDict):
+    >>> class FakeDict(dict):
     ...     def __init__(self, interface):
-    ...         UserDict.__init__(self)
+    ...         super(FakeDict, self).__init__()
     ...         self.interface = interface
     ...     def __getitem__(self, key):
     ...         return self.interface
 
=== modified file 'src/lazr/restful/example/base/tests/representation-cache.txt'
--- src/lazr/restful/example/base/tests/representation-cache.txt	2020-02-04 13:17:32 +0000
+++ src/lazr/restful/example/base/tests/representation-cache.txt	2020-07-22 23:32:54 +0000
@@ -94,8 +94,9 @@
 
     >>> test_cache.set("Cache this.", json, "1.0", "representation")
     >>> test_cache.set("Don't cache this.", json, "1.0", "representation")
-    >>> test_dict.keys()
-    ['Cache this.,application/json,1.0']
+    >>> for key in test_dict:
+    ...     print(key)
+    Cache this.,application/json,1.0
 
 ...UNLESS the representation being cached is for the version "cache
 everything!"
@@ -206,7 +207,7 @@
     >>> cookbook = [cookbook for cookbook in COOKBOOKS
     ...             if cookbook.name == "Everyday Greens"][0]
     >>> cache.set(cookbook, json, 'devel', "Dummy value.")
-    >>> print(dictionary.keys()[0])
+    >>> print(list(dictionary.keys())[0])
     http://.../devel/cookbooks/Everyday%20Greens,application/json
 
     >>> from six.moves.urllib.parse import quote
@@ -239,7 +240,7 @@
 
     >>> print(cache.get(recipe, json, 'devel'))
     None
-    >>> dictionary.keys()
+    >>> list(dictionary)
     []
 
 Data visibility
@@ -254,7 +255,7 @@
     >>> print(greens['confirmed'])
     tag:launchpad.net:2008:redacted
 
-    >>> dictionary.keys()
+    >>> list(dictionary)
     []
 
 This means that if your entry resources typically contain data that's
 
=== modified file 'src/lazr/restful/metazcml.py'
--- src/lazr/restful/metazcml.py	2020-02-04 19:02:02 +0000
+++ src/lazr/restful/metazcml.py	2020-07-22 23:32:54 +0000
@@ -479,7 +479,7 @@
     registered_adapters = set()
     block_mutator_operations = set()
 
-    methods = interface.namesAndDescriptions(True)
+    methods = list(interface.namesAndDescriptions(True))
     for iface in REGISTERED_CONTRIBUTORS[interface]:
         methods.extend(iface.namesAndDescriptions(True))
 
 
=== modified file 'src/lazr/restful/simple.py'
--- src/lazr/restful/simple.py	2020-02-04 13:17:32 +0000
+++ src/lazr/restful/simple.py	2020-07-22 23:32:54 +0000
@@ -207,7 +207,7 @@
 
     @property
     def top_level_names(self):
-        return self.top_level_objects.keys()
+        return list(self.top_level_objects.keys())
 
     def get(self, request, name):
         """Traverse to a top-level object."""
 
=== modified file 'src/lazr/restful/tales.py'
--- src/lazr/restful/tales.py	2020-02-05 12:16:44 +0000
+++ src/lazr/restful/tales.py	2020-07-22 23:32:54 +0000
@@ -222,7 +222,7 @@
         # iterate through attributes one at a time because some
         # versions of docutils don't case-normalize attributes.
         for attr_dict in attr_dicts:
-            for (key, val) in attr_dict.items():
+            for (key, val) in list(attr_dict.items()):
                 # Prefix all CSS classes with "rst-"; and prefix all
                 # names with "rst-" to avoid conflicts.
                 if key.lower() in ('class', 'id', 'name'):
 
=== modified file 'src/lazr/restful/tests/test_declarations.py'
--- src/lazr/restful/tests/test_declarations.py	2020-02-19 16:09:10 +0000
+++ src/lazr/restful/tests/test_declarations.py	2020-07-22 23:32:54 +0000
@@ -948,8 +948,8 @@
             *self.utility.active_versions)
         interface_10 = interfaces[0].object
         interface_20 = interfaces[1].object
-        self.assertEqual(interface_10.names(), ['field'])
-        self.assertEqual(interface_20.names(), ['field'])
+        self.assertEqual(list(interface_10.names()), ['field'])
+        self.assertEqual(list(interface_20.names()), ['field'])
 
     def test_field_exported_as_of_later_version_is_not_exported_in_earlier_versions(self):
         # If you export a field as_of version 2.0, it's not present in
@@ -959,8 +959,8 @@
             *self.utility.active_versions)
         interface_10 = interfaces[0].object
         interface_20 = interfaces[1].object
-        self.assertEqual(interface_10.names(), [])
-        self.assertEqual(interface_20.names(), ['field'])
+        self.assertEqual(list(interface_10.names()), [])
+        self.assertEqual(list(interface_20.names()), ['field'])
 
     def test_field_not_exported_using_as_of_fails(self):
         # If you export a field without specifying as_of, you get an