Merge ~cjwatson/lazr.restful:remove-six-moves into lazr.restful:main

[Colin Watson]

Remove uses of six.moves

[Jürgen Gmach (jugmac00)]

LGTM

review: Approve

diff --git a/src/lazr/restful/docs/multiversion.rst b/src/lazr/restful/docs/multiversion.rst
index 6f3fd68..8a3faca 100644
--- a/src/lazr/restful/docs/multiversion.rst
+++ b/src/lazr/restful/docs/multiversion.rst
@@ -163,7 +163,7 @@ contacts.
 
 Here's a simple implementation of IContact.
 
-    >>> from six.moves.urllib.parse import quote
+    >>> from urllib.parse import quote
     >>> from zope.interface import implementer
     >>> from lazr.restful.security import protect_schema
     >>> @implementer(IContact, ILocation)
diff --git a/src/lazr/restful/docs/webservice-declarations.rst b/src/lazr/restful/docs/webservice-declarations.rst
index 964f5ff..2a8eb46 100644
--- a/src/lazr/restful/docs/webservice-declarations.rst
+++ b/src/lazr/restful/docs/webservice-declarations.rst
@@ -55,8 +55,8 @@ These declarations add tagged values to the original interface elements.
 The tags are in the lazr.restful namespace and are dictionaries of
 elements.
 
+    >>> from collections.abc import Mapping
     >>> from pprint import pformat
-    >>> from six.moves.collections_abc import Mapping
     >>> def print_export_tag(element):
     ...     """Print the content of the 'lazr.restful.exported' tag."""
     ...     def format_value(value):
@@ -1285,7 +1285,7 @@ URL to the newly created object. The body of the response will be empty.
 (For the URL generation to work, we need to register an IAbsoluteURL
 adapter and set the request as the current interaction.)
 
-    >>> from six.moves.urllib.parse import quote
+    >>> from urllib.parse import quote
     >>> from zope.component import provideAdapter
     >>> from zope.traversing.browser.interfaces import IAbsoluteURL
     >>> from zope.publisher.interfaces.http import IHTTPApplicationRequest
diff --git a/src/lazr/restful/docs/webservice.rst b/src/lazr/restful/docs/webservice.rst
index 6397038..5289633 100644
--- a/src/lazr/restful/docs/webservice.rst
+++ b/src/lazr/restful/docs/webservice.rst
@@ -114,7 +114,7 @@ interface, and the URL of an object is found by using the IAbsoluteURL
 interface.
 
 
-    >>> from six.moves.urllib.parse import quote
+    >>> from urllib.parse import quote
     >>> from zope.component import (
     ...     adapter, getSiteManager, getMultiAdapter)
     >>> from zope.interface import implementer
@@ -201,7 +201,7 @@ interface.
 
     >>> protect_schema(Cookbook, ICookbook, write_permission=CheckerPublic)
 
-    >>> from six.moves.urllib.parse import unquote
+    >>> from urllib.parse import unquote
     >>> @implementer(IPublishTraverse)
     ... @adapter(ICookbook, IBrowserRequest)
     ... class CookbookTraversal:
diff --git a/src/lazr/restful/example/base/tests/collection.txt b/src/lazr/restful/example/base/tests/collection.txt
index 08009ad..c2a47dc 100644
--- a/src/lazr/restful/example/base/tests/collection.txt
+++ b/src/lazr/restful/example/base/tests/collection.txt
@@ -85,7 +85,7 @@ results in a 400 error.
 
 A collection may be empty.
 
-    >>> from six.moves.urllib.parse import quote
+    >>> from urllib.parse import quote
     >>> url = quote("/cookbooks/Cooking Without Recipes/recipes")
     >>> result = webservice.get(url)
     >>> list(result.jsonBody()['entries'])
diff --git a/src/lazr/restful/example/base/tests/entry.txt b/src/lazr/restful/example/base/tests/entry.txt
index ba48787..c260361 100644
--- a/src/lazr/restful/example/base/tests/entry.txt
+++ b/src/lazr/restful/example/base/tests/entry.txt
@@ -22,7 +22,7 @@ GET request to the entry's URL.
 
 Here we see that the cookbook 'Everyday Greens' is a vegetarian cookbook.
 
-    >>> from six.moves.urllib.parse import quote
+    >>> from urllib.parse import quote
     >>> greens_url = quote("/cookbooks/Everyday Greens")
     >>> print(webservice.get(greens_url).jsonBody()['cuisine'])
     Vegetarian
diff --git a/src/lazr/restful/example/base/tests/field.txt b/src/lazr/restful/example/base/tests/field.txt
index aa09231..a1e51c7 100644
--- a/src/lazr/restful/example/base/tests/field.txt
+++ b/src/lazr/restful/example/base/tests/field.txt
@@ -8,7 +8,7 @@ field resource itself, rather than PUT/PATCH to the entry.
     >>> from lazr.restful.testing.webservice import WebServiceCaller
     >>> webservice = WebServiceCaller(domain='cookbooks.dev')
 
-    >>> from six.moves.urllib.parse import quote
+    >>> from urllib.parse import quote
     >>> cookbook_url = quote("/cookbooks/The Joy of Cooking")
     >>> field_url = cookbook_url + "/description"
 
diff --git a/src/lazr/restful/example/base/tests/hostedfile.txt b/src/lazr/restful/example/base/tests/hostedfile.txt
index 4725646..53ff057 100644
--- a/src/lazr/restful/example/base/tests/hostedfile.txt
+++ b/src/lazr/restful/example/base/tests/hostedfile.txt
@@ -15,7 +15,7 @@ File resources
 
 A cookbook starts out with a link to a cover image, but no actual cover.
 
-    >>> from six.moves.urllib.parse import quote
+    >>> from urllib.parse import quote
     >>> greens_url = quote("/cookbooks/Everyday Greens")
     >>> greens = webservice.get(greens_url).jsonBody()
     >>> print(greens['cover_link'])
diff --git a/src/lazr/restful/example/base/tests/representation-cache.txt b/src/lazr/restful/example/base/tests/representation-cache.txt
index 7870eac..0b6a340 100644
--- a/src/lazr/restful/example/base/tests/representation-cache.txt
+++ b/src/lazr/restful/example/base/tests/representation-cache.txt
@@ -211,7 +211,7 @@ POST did.
     >>> print(list(dictionary.keys())[0])
     http://.../devel/cookbooks/Everyday%20Greens,application/json
 
-    >>> from six.moves.urllib.parse import quote
+    >>> from urllib.parse import quote
     >>> greens_url = quote("/cookbooks/Everyday Greens")
     >>> ignore = webservice.named_post(
     ...     greens_url, "replace_cover", cover="foo")
diff --git a/src/lazr/restful/example/base/tests/service.txt b/src/lazr/restful/example/base/tests/service.txt
index dcaf6cf..67e7ac3 100644
--- a/src/lazr/restful/example/base/tests/service.txt
+++ b/src/lazr/restful/example/base/tests/service.txt
@@ -59,7 +59,7 @@ resource yields a 405 error.
     Allow: GET POST
     ...
 
-    >>> from six.moves.urllib.parse import quote
+    >>> from urllib.parse import quote
     >>> print(webservice.delete(quote("/dishes/Roast chicken")))
     HTTP/1.1 405 Method Not Allowed...
     Allow: GET PUT PATCH
diff --git a/src/lazr/restful/example/base/tests/wadl.txt b/src/lazr/restful/example/base/tests/wadl.txt
index e9ba3e9..47ea28f 100644
--- a/src/lazr/restful/example/base/tests/wadl.txt
+++ b/src/lazr/restful/example/base/tests/wadl.txt
@@ -12,7 +12,7 @@ Entry resources
 Let's get a WADL representation of an entry resource (in this case, a
 cookbook), and see what's inside.
 
-    >>> from six.moves.urllib.parse import quote
+    >>> from urllib.parse import quote
     >>> from lazr.restful.testing.webservice import WebServiceCaller
     >>> webservice = WebServiceCaller(domain='cookbooks.dev')
     >>> entry_url = quote("/cookbooks/The Joy of Cooking")
diff --git a/src/lazr/restful/example/base/traversal.py b/src/lazr/restful/example/base/traversal.py
index 4ae07a9..a48f346 100644
--- a/src/lazr/restful/example/base/traversal.py
+++ b/src/lazr/restful/example/base/traversal.py
@@ -9,11 +9,11 @@ __all__ = [
     "TraverseWithGet",
 ]
 
-
-from six.moves.urllib.parse import (
+from urllib.parse import (
     unquote,
     urlparse,
 )
+
 from zope.component import getUtility
 from zope.publisher.interfaces import IPublishTraverse, NotFound
 from zope.publisher.interfaces.browser import IDefaultBrowserLayer
diff --git a/src/lazr/restful/marshallers.py b/src/lazr/restful/marshallers.py
index 3439106..20f6f9e 100644
--- a/src/lazr/restful/marshallers.py
+++ b/src/lazr/restful/marshallers.py
@@ -25,10 +25,10 @@ from collections import OrderedDict
 from datetime import datetime
 from io import BytesIO
 import re
+from urllib.parse import unquote
 
 import pytz
 import simplejson
-from six.moves.urllib.parse import unquote
 
 from zope.datetime import (
     DateTimeError,
diff --git a/src/lazr/restful/publisher.py b/src/lazr/restful/publisher.py
index 92b668a..67e4ea0 100644
--- a/src/lazr/restful/publisher.py
+++ b/src/lazr/restful/publisher.py
@@ -12,13 +12,13 @@ __all__ = [
     "WebServiceRequestTraversal",
 ]
 
-
-import simplejson
-from six.moves.urllib.parse import (
+from urllib.parse import (
     quote,
     urlsplit,
     urlunsplit,
 )
+
+import simplejson
 from zope.component import (
     adapter,
     getMultiAdapter,
diff --git a/src/lazr/restful/simple.py b/src/lazr/restful/simple.py
index 2c58320..3a2b271 100644
--- a/src/lazr/restful/simple.py
+++ b/src/lazr/restful/simple.py
@@ -16,11 +16,11 @@ __all__ = [
 ]
 
 import traceback
-
-from six.moves.urllib.parse import (
+from urllib.parse import (
     quote,
     unquote,
 )
+
 from zope.component import (
     adapter,
     getMultiAdapter,
diff --git a/src/lazr/restful/tales.py b/src/lazr/restful/tales.py
index 0be2185..6b975fe 100644
--- a/src/lazr/restful/tales.py
+++ b/src/lazr/restful/tales.py
@@ -30,6 +30,7 @@ import operator
 import re
 import simplejson
 import textwrap
+from urllib.parse import quote
 
 from docutils import io
 from docutils.core import Publisher
@@ -45,7 +46,6 @@ from docutils.writers.html4css1 import (
     Writer as HTMLWriter,
 )
 from docutils.writers.null import Writer as NullWriter
-from six.moves.urllib.parse import quote
 from zope.component import (
     adapter,
     getGlobalSiteManager,
diff --git a/src/lazr/restful/testing/webservice.py b/src/lazr/restful/testing/webservice.py
index 148fd4c..85e8ba6 100644
--- a/src/lazr/restful/testing/webservice.py
+++ b/src/lazr/restful/testing/webservice.py
@@ -27,14 +27,14 @@ import simplejson
 import sys
 from types import ModuleType
 import unittest
+from urllib.parse import (
+    quote,
+    urljoin,
+)
 
 import wsgi_intercept
 
 import six
-from six.moves.urllib.parse import (
-    quote,
-    urljoin,
-)
 from zope.component import adapter, getGlobalSiteManager, getUtility
 from zope.configuration import xmlconfig
 from zope.interface import alsoProvides, implementer, Interface