From c195f895db7bd3ec7a8618956a71e67152e32df7 Mon Sep 17 00:00:00 2001
From: Itamar Turner-Trauring <itamar@itamarst.org>
Date: Tue, 16 Nov 2021 11:16:26 -0500
Subject: [PATCH] Python 2 support.

---
 src/allmydata/storage/http_client.py    | 19 ++++++++++++++++++-
 src/allmydata/storage/http_server.py    | 18 ++++++++++++++++--
 src/allmydata/test/test_storage_http.py | 12 ++++++++++++
 3 files changed, 46 insertions(+), 3 deletions(-)

diff --git a/src/allmydata/storage/http_client.py b/src/allmydata/storage/http_client.py
index 8e14d1137..4a143a60b 100644
--- a/src/allmydata/storage/http_client.py
+++ b/src/allmydata/storage/http_client.py
@@ -2,6 +2,21 @@
 HTTP client that talks to the HTTP storage server.
 """
 
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+from __future__ import unicode_literals
+
+from future.utils import PY2
+
+if PY2:
+    # fmt: off
+    from future.builtins import filter, map, zip, ascii, chr, hex, input, next, oct, open, pow, round, super, bytes, dict, list, object, range, str, max, min  # noqa: F401
+    # fmt: on
+else:
+    from typing import Union
+    from treq.testing import StubTreq
+
 import base64
 
 # TODO Make sure to import Python version?
@@ -35,7 +50,9 @@ class StorageClient(object):
     HTTP client that talks to the HTTP storage server.
     """
 
-    def __init__(self, url: DecodedURL, swissnum, treq=treq):
+    def __init__(
+        self, url, swissnum, treq=treq
+    ):  # type: (DecodedURL, bytes, Union[treq,StubTreq]) -> None
         self._base_url = url
         self._swissnum = swissnum
         self._treq = treq
diff --git a/src/allmydata/storage/http_server.py b/src/allmydata/storage/http_server.py
index 91387c58f..373d31e2e 100644
--- a/src/allmydata/storage/http_server.py
+++ b/src/allmydata/storage/http_server.py
@@ -2,6 +2,18 @@
 HTTP server for storage.
 """
 
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+from __future__ import unicode_literals
+
+from future.utils import PY2
+
+if PY2:
+    # fmt: off
+    from future.builtins import filter, map, zip, ascii, chr, hex, input, next, oct, open, pow, round, super, bytes, dict, list, object, range, str, max, min  # noqa: F401
+    # fmt: on
+
 from functools import wraps
 
 from klein import Klein
@@ -61,12 +73,14 @@ class HTTPServer(object):
 
     _app = Klein()
 
-    def __init__(self, storage_server: StorageServer, swissnum):
+    def __init__(
+        self, storage_server, swissnum
+    ):  # type: (StorageServer, bytes) -> None
         self._storage_server = storage_server
         self._swissnum = swissnum
 
     def get_resource(self):
-        """Return twisted.web Resource for this object."""
+        """Return twisted.web ``Resource`` for this object."""
         return self._app.resource()
 
     def _cbor(self, request, data):
diff --git a/src/allmydata/test/test_storage_http.py b/src/allmydata/test/test_storage_http.py
index b659a6ace..9ba8adf21 100644
--- a/src/allmydata/test/test_storage_http.py
+++ b/src/allmydata/test/test_storage_http.py
@@ -2,6 +2,18 @@
 Tests for HTTP storage client + server.
 """
 
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+from __future__ import unicode_literals
+
+from future.utils import PY2
+
+if PY2:
+    # fmt: off
+    from future.builtins import filter, map, zip, ascii, chr, hex, input, next, oct, open, pow, round, super, bytes, dict, list, object, range, str, max, min  # noqa: F401
+    # fmt: on
+
 from twisted.trial.unittest import TestCase
 from twisted.internet.defer import inlineCallbacks