Merge lp:~cjwatson/lazr.restful/fix-tests into lp:lazr.restful

[Colin Watson]

Fix a couple of test failures with newer dependency versions.

[lp:~cjwatson/lazr.restful/fix-tests]

226. By Colin Watson on 2019-11-03

Merge trunk.

[Ioana Lasc (ilasc)]

review: Approve

=== modified file 'NEWS.txt'
--- NEWS.txt	2019-11-02 23:58:59 +0000
+++ NEWS.txt	2019-11-03 18:40:32 +0000
@@ -19,6 +19,11 @@
 Fixed bug 1803564: Values from requests that contain only whitespace are now
 interpreted correctly.
 
+Fix test failures with zope.configuration >= 4.3.0.
+
+Fix test failures with Python >= 2.7.17 (or backported fixes for
+CVE-2019-9740).
+
 0.20.1 (2018-02-21)
 ===================
 
 
=== modified file 'src/lazr/restful/docs/webservice-declarations.txt'
--- src/lazr/restful/docs/webservice-declarations.txt	2018-09-28 15:41:05 +0000
+++ src/lazr/restful/docs/webservice-declarations.txt	2019-11-03 18:40:32 +0000
@@ -2699,10 +2699,10 @@
     >>> register_test_module('wrongorder', WrongOrderVersions)
     Traceback (most recent call last):
     ...
-    ConfigurationExecutionError: <type 'exceptions.AssertionError'>:
+    ConfigurationExecutionError: ...AssertionError...
     Annotations on "WrongOrderVersions.method" put an earlier version
     on top of a later version: "beta", "2.0", "1.0". The correct order
-    is: "beta", "1.0", "2.0".  ...
+    is: "beta", "1.0", "2.0"...
 
 Here's a class in which a named operation is removed in version 1.0
 and then annotated without being reinstated.
@@ -2723,8 +2723,7 @@
     ...
     ConfigurationExecutionError: ... Method "method" contains
     annotations for version "2.0", even though it's not published in
-    that version. The bad annotations are: "as", "params".
-    ...
+    that version. The bad annotations are: "as", "params"...
 
 Mutators as named operations
 ----------------------------
 
=== modified file 'src/lazr/restful/example/base/tests/collection.txt'
--- src/lazr/restful/example/base/tests/collection.txt	2015-04-09 14:02:44 +0000
+++ src/lazr/restful/example/base/tests/collection.txt	2019-11-03 18:40:32 +0000
@@ -247,7 +247,7 @@
 The error message may contain Unicode characters:
 
     >>> from lazr.restful.testing.helpers import encode_response
-    >>> url = u"/cookbooks?ws.op=find_for_cuisine&cuisine=\N{SNOWMAN}"
+    >>> url = u"/cookbooks?ws.op=find_for_cuisine&cuisine=%E2%98%83"
     >>> response = webservice.get(url.encode("utf-8"))
     >>> print encode_response(response)
     HTTP/1.1 400 Bad Request