Remove imports related to Python 2 compatibility.

client/devpi/test.py

@@ -1,5 +1,3 @@
-
-from __future__ import with_statement
 import re
 import shlex
 import hashlib

client/devpi/use.py

@@ -1,9 +1,6 @@
 from copy import deepcopy
 from operator import attrgetter
-try:
-    from urllib.parse import quote as url_quote
-except ImportError:
-    from urllib import quote as url_quote  # noqa: F401
+from urllib.parse import quote as url_quote
 import itertools
 import os
 import sys

client/testing/conftest.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 from _pytest import capture
 from contextlib import closing
 from devpi_common.metadata import parse_version

common/devpi_common/types.py

@@ -1,4 +1,3 @@
-from __future__ import absolute_import, unicode_literals
 from lazy import lazy as cached_property  # noqa: F401 must be importable
 from types import FunctionType
 import hashlib

common/testing/test_url.py

@@ -1,4 +1,3 @@
-from __future__ import unicode_literals
 import hashlib
 import posixpath
 import pytest

server/test_devpi_server/functional.py

@@ -1,12 +1,9 @@
 # this file is shared via symlink with devpi-client,
+# so it must continue to work with the lowest supported Python 3.x version
 from devpi_common.metadata import parse_version
+from urllib.parse import quote as url_quote
 import pytest
 
-try:
-    from urllib.parse import quote as url_quote
-except ImportError:
-    from urllib import quote as url_quote  # type: ignore
-
 
 class API:
     def __init__(self, d):

server/test_devpi_server/reqmock.py

@@ -1,8 +1,8 @@
 # this file is shared via symlink with devpi-client,
-# so for the time being it must continue to work with Python 2
+# so it must continue to work with the lowest supported Python 3.x version
 from io import BytesIO
 from requests.adapters import HTTPAdapter
-from requests.packages.urllib3.response import HTTPResponse  # type: ignore
+from requests.packages.urllib3.response import HTTPResponse
 import fnmatch
 import pytest
 

server/test_devpi_server/simpypi.py

@@ -1,15 +1,8 @@
 # this file is shared via symlink with devpi-client,
-# so for the time being it must continue to work with Python 2
-from __future__ import print_function
-try:
-    from html import escape
-except ImportError:
-    from cgi import escape  # type: ignore
+# so it must continue to work with the lowest supported Python 3.x version
+from html import escape
 import hashlib
-try:
-    import http.server as httpserver
-except ImportError:
-    import BaseHTTPServer as httpserver  # type: ignore
+import http.server as httpserver
 import sys