Merge ~cjwatson/lazr.restful:simplify-pformat-value into lazr.restful:main

[Colin Watson]

Simplify lazr.restful.testing.webservice.pformat_value

[Jürgen Gmach (jugmac00)]

review: Approve

diff --git a/src/lazr/restful/testing/webservice.py b/src/lazr/restful/testing/webservice.py
index 85e8ba6..193ada8 100644
--- a/src/lazr/restful/testing/webservice.py
+++ b/src/lazr/restful/testing/webservice.py
@@ -193,19 +193,9 @@ def pformat_value(value):
     """Pretty-format a single value.
 
     This is similar to `repr()`, but for doctest compatibility we format
-    text and bytes in a way that looks the same on both Python 2 and 3.
-    JSON strings are always Unicode, never bytes, so this doesn't introduce
-    ambiguity.
+    values in a way that is unambiguous across Python versions.
     """
-    if isinstance(value, str):
-        value = value.encode("unicode_escape").decode("ASCII")
-        if "'" in value and '"' not in value:
-            return '"%s"' % value
-        else:
-            return "'%s'" % value.replace("'", "\\'")
-    elif isinstance(value, list):
-        return "[" + ", ".join(pformat_value(item) for item in value) + "]"
-    elif isinstance(value, OrderedDict):
+    if 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.