From 13fd3b3685ab2255931353387bd07139bd1165cb Mon Sep 17 00:00:00 2001 From: Itamar Turner-Trauring Date: Mon, 14 Mar 2022 11:01:20 -0400 Subject: [PATCH] Get rid of Python 2 crud. --- src/allmydata/storage/http_client.py | 23 ++--------------------- 1 file changed, 2 insertions(+), 21 deletions(-) diff --git a/src/allmydata/storage/http_client.py b/src/allmydata/storage/http_client.py index 5733c1514..2790f1f7e 100644 --- a/src/allmydata/storage/http_client.py +++ b/src/allmydata/storage/http_client.py @@ -2,27 +2,8 @@ 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 - from collections import defaultdict - - Optional = Set = defaultdict( - lambda: None - ) # some garbage to just make this module import -else: - # typing module not available in Python 2, and we only do type checking in - # Python 3 anyway. - from typing import Union, Set, Optional - from treq.testing import StubTreq +from typing import Union, Set, Optional +from treq.testing import StubTreq from base64 import b64encode