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

[Colin Watson]

Preserve specified parameter ordering in export_factory_operation.

Preserve specified parameter ordering in export_factory_operation and BaseResourceOperationAdapter. This can make a difference when creating objects, by ensuring that validators are called in the correct order.

[Cristian Gonzalez (cristiangsp)]

Looks good!

review: Approve

=== modified file 'NEWS.rst'
--- NEWS.rst	2021-01-21 14:33:34 +0000
+++ NEWS.rst	2021-02-16 16:53:00 +0000
@@ -2,6 +2,13 @@
 NEWS for lazr.restful
 =====================
 
+1.0.1
+=====
+
+Preserve specified parameter ordering in ``export_factory_operation`` and
+``BaseResourceOperationAdapter``.  This can make a difference when creating
+objects, by ensuring that validators are called in the correct order.
+
 1.0.0 (2021-01-21)
 ==================
 
 
=== modified file 'setup.py'
--- setup.py	2021-01-21 11:48:06 +0000
+++ setup.py	2021-02-16 16:53:00 +0000
@@ -61,7 +61,7 @@
         'pytz',
         'setuptools',
         'simplejson>=2.1.0',
-        'six>=1.12.0',
+        'six>=1.13.0',
         'testtools',
         'van.testing',
         'wsgiref; python_version < "3"',
 
=== modified file 'src/lazr/restful/declarations.py'
--- src/lazr/restful/declarations.py	2020-08-17 11:46:51 +0000
+++ src/lazr/restful/declarations.py	2021-02-16 16:53:00 +0000
@@ -43,6 +43,7 @@
     'webservice_error',
     ]
 
+from collections import OrderedDict
 import copy
 import itertools
 import sys
@@ -1019,7 +1020,7 @@
         # pylint: disable-msg=W0231
         _check_called_from_interface_def('%s()' % self.__class__.__name__)
         self.interface = interface
-        self.params = {}
+        self.params = OrderedDict()
         for name in field_names:
             field = interface.get(name)
             if field is None:
@@ -1519,7 +1520,7 @@
             (param_def.__name__, orig_name)
             for orig_name, param_def in self._export_info['params'].items()
             if param_def.__name__ != orig_name)
-        params = {}
+        params = OrderedDict()
         for name, value in kwargs.items():
             name = renames.get(name, name)
             params[name] = value
 
=== modified file 'src/lazr/restful/docs/webservice-declarations.rst'
--- src/lazr/restful/docs/webservice-declarations.rst	2021-01-18 11:58:31 +0000
+++ src/lazr/restful/docs/webservice-declarations.rst	2021-02-16 16:53:00 +0000
@@ -56,11 +56,12 @@
 elements.
 
     >>> from pprint import pformat
+    >>> from six.moves.collections_abc import Mapping
     >>> def print_export_tag(element):
     ...     """Print the content of the 'lazr.restful.exported' tag."""
     ...     def format_value(value):
-    ...         if isinstance(value, dict):
-    ...             return pformat(value, width=40)
+    ...         if isinstance(value, Mapping):
+    ...             return pformat(dict(value), width=40)
     ...         else:
     ...             return repr(value)
     ...     tag = element.queryTaggedValue('lazr.restful.exported')