Merge lp:~cjwatson/lazr.restful/py3-encode-unicode into lp:lazr.restful

[Colin Watson]

Make encode_unicode return str on Python 3.

It's used in doctests, so returning bytes works much less well.

[Thiago F. Pappacena (pappacena)]

LGTM

review: Approve

=== modified file 'NEWS.rst'
--- NEWS.rst	2021-01-20 11:23:16 +0000
+++ NEWS.rst	2021-01-20 23:42:29 +0000
@@ -18,6 +18,9 @@
 ``lazr.restful.testing.webservice.pprint_collection`` recurse into lists in
 order to print text string representations in the Python 3 style.
 
+Make ``lazr.restful.testing.helpers.encode_unicode`` return ``str`` on
+Python 3.
+
 0.23.0 (2020-09-28)
 ===================
 

=== modified file 'src/lazr/restful/testing/helpers.py'
--- src/lazr/restful/testing/helpers.py	2020-07-22 22:28:49 +0000
+++ src/lazr/restful/testing/helpers.py	2021-01-20 23:42:29 +0000
@@ -3,6 +3,7 @@
 import sys
 from types import ModuleType
 
+import six
 from zope.configuration import xmlconfig
 from zope.interface import implementer
 
@@ -64,7 +65,7 @@
 
     :param unicode_string: A Unicode string.
     """
-    return unicode_string.encode("ascii", "backslashreplace")
+    return six.ensure_str(unicode_string.encode("ascii", "backslashreplace"))
 
 
 @implementer(IWebServiceConfiguration)