Merge lp:~cjwatson/lazr.restful/py3-doctest-encoding into lp:lazr.restful

[Colin Watson]

Set doctest encoding to UTF-8.

This allows us to write Unicode characters directly in doctests, which makes some tests more portable between Python 2 and 3.

[Ioana Lasc (ilasc)]

review: Approve

=== modified file 'src/lazr/restful/docs/utils.rst'
--- src/lazr/restful/docs/utils.rst	2020-02-04 11:52:59 +0000
+++ src/lazr/restful/docs/utils.rst	2020-08-10 15:07:50 +0000
@@ -330,22 +330,21 @@
 quotation marks.
 
     >>> from lazr.restful.utils import smartquote
-    >>> smartquote('')
-    u''
-    >>> smartquote('foo "bar" baz')
-    u'foo \u201cbar\u201d baz'
-    >>> smartquote('foo "bar baz')
-    u'foo \u201cbar baz'
-    >>> smartquote('foo bar" baz')
-    u'foo bar\u201d baz'
-    >>> smartquote('""foo " bar "" baz""')
-    u'""foo " bar "" baz""'
-    >>> smartquote('" foo "')
-    u'" foo "'
-    >>> smartquote('"foo".')
-    u'\u201cfoo\u201d.'
-    >>> smartquote('a lot of "foo"?')
-    u'a lot of \u201cfoo\u201d?'
+    >>> print(smartquote(''))
+    >>> print(smartquote('foo "bar" baz'))
+    foo “bar” baz
+    >>> print(smartquote('foo "bar baz'))
+    foo “bar baz
+    >>> print(smartquote('foo bar" baz'))
+    foo bar” baz
+    >>> print(smartquote('""foo " bar "" baz""'))
+    ""foo " bar "" baz""
+    >>> print(smartquote('" foo "'))
+    " foo "
+    >>> print(smartquote('"foo".'))
+    “foo”.
+    >>> print(smartquote('a lot of "foo"?'))
+    a lot of “foo”?
 
 safe_js_escape()
 ================

=== modified file 'src/lazr/restful/docs/webservice-marshallers.rst'
--- src/lazr/restful/docs/webservice-marshallers.rst	2020-08-04 11:54:09 +0000
+++ src/lazr/restful/docs/webservice-marshallers.rst	2020-08-10 15:07:50 +0000
@@ -56,8 +56,8 @@
     'foo'
     >>> marshaller.marshall_from_json_data(4)
     4
-    >>> marshaller.marshall_from_json_data(u"unicode\u2122")
-    u'unicode\u2122'
+    >>> print(marshaller.marshall_from_json_data(u"unicode\u2122"))
+    unicode™
     >>> marshaller.marshall_from_json_data("")
     ''
     >>> print(marshaller.marshall_from_json_data(None))
@@ -499,8 +499,8 @@
 
 Note that the marshaller accepts character values where bit 7 is set.
 
-    >>> marshaller.marshall_from_json_data(u'int\xe9ressant')
-    u'int\xe9ressant'
+    >>> print(marshaller.marshall_from_json_data(u'int\xe9ressant'))
+    intéressant
 
 Non-string values like floats are rejected.
 
@@ -525,8 +525,8 @@
     u'True'
     >>> marshaller.marshall_from_request('')
     u''
-    >>> marshaller.marshall_from_request(u'int\xe9ressant')
-    u'int\xe9ressant'
+    >>> print(marshaller.marshall_from_request(u'int\xe9ressant'))
+    intéressant
     >>> marshaller.marshall_from_request('1.0')
     u'1.0'
 

=== modified file 'src/lazr/restful/tests/test_docs.py'
--- src/lazr/restful/tests/test_docs.py	2020-02-04 11:52:59 +0000
+++ src/lazr/restful/tests/test_docs.py	2020-08-10 15:07:50 +0000
@@ -58,5 +58,5 @@
         }
     tests.addTest(doctest.DocFileSuite(
         *doctest_files, module_relative=False, optionflags=DOCTEST_FLAGS,
-        tearDown=tearDown, globs=globs))
+        tearDown=tearDown, globs=globs, encoding='UTF-8'))
     return tests