Merge lp:~cjwatson/lazr.restful/pformat-value-ordered-dict into lp:lazr.restful

[Colin Watson]

Handle OrderedDicts in pformat_value.

Now that WebServiceResponseWrapper.jsonBody turns JSON objects into OrderedDicts, this is useful for doctest compatibility; a few Launchpad tests fail without this.

[Thiago F. Pappacena (pappacena)]

LGTM

review: Approve

=== modified file 'src/lazr/restful/testing/webservice.py'
--- src/lazr/restful/testing/webservice.py	2021-05-18 16:02:47 +0000
+++ src/lazr/restful/testing/webservice.py	2021-05-20 20:56:28 +0000
@@ -194,6 +194,16 @@
             return "'%s'" % value.replace("'", "\\'")
     elif isinstance(value, list):
         return '[' + ', '.join(pformat_value(item) for item in value) + ']'
+    elif isinstance(value, OrderedDict):
+        # WebServiceResponseWrapper.jsonBody turns JSON objects into
+        # OrderedDicts, but for doctest compatibility we just want to
+        # re-sort and render these as if they were ordinary dicts.
+        return (
+            '{' +
+            ', '.join(
+                '%s: %s' % (pformat_value(k), pformat_value(v))
+                for k, v in sorted(value.items())) +
+            '}')
     else:
         return repr(value)