more python2 removal

docs/conf.py

@@ -12,9 +12,6 @@
 # All configuration values have a default; values that are commented out
 # serve to show the default.
 
-import sys
-import os
-
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.

integration/test_aaa_aardvark.py

@@ -6,11 +6,6 @@
 # longer" to start the first test as the fixtures get built
 
 
-from future.utils import PY2
-if PY2:
-    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
-
-
 def test_create_flogger(flog_gatherer):
     print("Created flog_gatherer")
 

integration/test_sftp.py

@@ -10,11 +10,6 @@ These tests use Paramiko, rather than Twisted's Conch, because:
     2. Its API is much simpler to use.
 """
 
-
-from future.utils import PY2
-if PY2:
-    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
-
 import os.path
 from posixpath import join
 from stat import S_ISDIR

integration/test_streaming_logs.py

@@ -2,10 +2,6 @@
 Ported to Python 3.
 """
 
-from future.utils import PY2
-if PY2:
-    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
-
 from six import ensure_text
 
 import json

misc/simulators/sizes.py

@@ -1,11 +1,5 @@
 #! /usr/bin/env python
 
-
-from future.utils import PY2
-if PY2:
-    from future.builtins import input
-
-
 import random, math, re
 from twisted.python import usage
 

src/allmydata/__main__.py

@@ -2,11 +2,6 @@
 Ported to Python 3.
 """
 
-
-from future.utils import PY2
-if PY2:
-    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
-
 import sys
 
 from allmydata.scripts.runner import run

src/allmydata/_monkeypatch.py

@@ -4,41 +4,14 @@ Monkey-patching of third party libraries.
 Ported to Python 3.
 """
 
-
 from future.utils import PY2
-if PY2:
-    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
 
 from warnings import catch_warnings
 
 
 def patch():
     """Path third-party libraries to make Tahoe-LAFS work."""
-    # Make sure Foolscap always get native strings passed to method names in callRemote.
-    # This can be removed when any one of the following happens:
-    #
-    # 1. Tahoe-LAFS on Python 2 switches to version of Foolscap that fixes
-    #    https://github.com/warner/foolscap/issues/72
-    # 2. Foolscap is dropped as a dependency.
-    # 3. Tahoe-LAFS drops Python 2 support.
 
     if not PY2:
         # Python 3 doesn't need to monkey patch Foolscap
         return
-
-    # We need to suppress warnings so as to prevent unexpected output from
-    # breaking some integration tests.
-    with catch_warnings(record=True):
-        # Only tested with this version; ensure correctness with new releases,
-        # and then either update the assert or hopefully drop the monkeypatch.
-        from foolscap import __version__
-        assert __version__ == "0.13.1", "Wrong version %s of Foolscap" % (__version__,)
-
-        from foolscap.referenceable import RemoteReference
-        original_getMethodInfo = RemoteReference._getMethodInfo
-
-        def _getMethodInfo(self, name):
-            if isinstance(name, str):
-                name = name.encode("utf-8")
-            return original_getMethodInfo(self, name)
-        RemoteReference._getMethodInfo = _getMethodInfo

src/allmydata/blacklist.py

@@ -2,10 +2,6 @@
 Ported to Python 3.
 """
 
-from future.utils import PY2
-if PY2:
-        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
-
 import os
 
 from zope.interface import implementer

src/allmydata/check_results.py

@@ -1,10 +1,6 @@
 """Ported to Python 3.
 """
 
-from future.utils import PY2
-if PY2:
-    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
-
 from past.builtins import unicode
 
 from zope.interface import implementer

src/allmydata/codec.py

@@ -4,10 +4,6 @@ CRS encoding and decoding.
 Ported to Python 3.
 """
 
-from future.utils import PY2
-if PY2:
-    from 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
-
 from zope.interface import implementer
 from allmydata.util import mathutil
 from allmydata.util.assertutil import precondition

src/allmydata/crypto/__init__.py

@@ -9,7 +9,3 @@ objects that `cryptography` documents.
 Ported to Python 3.
 """
 
-
-from future.utils import PY2
-if PY2:
-    from 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

src/allmydata/crypto/aes.py

@@ -10,10 +10,6 @@ objects that `cryptography` documents.
 Ported to Python 3.
 """
 
-from future.utils import PY2
-if PY2:
-    from 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
-
 import six
 
 from cryptography.hazmat.backends import default_backend

src/allmydata/crypto/error.py

@@ -4,11 +4,6 @@ Exceptions raise by allmydata.crypto.* modules
 Ported to Python 3.
 """
 
-from future.utils import PY2
-if PY2:
-    from 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
-
-
 class BadSignature(Exception):
     """
     An alleged signature did not match

src/allmydata/crypto/util.py

@@ -4,10 +4,6 @@ Utilities used by allmydata.crypto modules
 Ported to Python 3.
 """
 
-from future.utils import PY2
-if PY2:
-    from 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
-
 from allmydata.crypto.error import BadPrefixError
 
 

src/allmydata/deep_stats.py

@@ -3,10 +3,6 @@
 Ported to Python 3.
 """
 
-from future.utils import PY2
-if PY2:
-    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
-
 import math
 
 from allmydata.interfaces import IImmutableFileNode

src/allmydata/dirnode.py

@@ -3,10 +3,6 @@
 Ported to Python 3.
 """
 
-from future.utils import PY2
-if PY2:
-    # Skip dict so it doesn't break things.
-    from future.builtins import filter, map, zip, ascii, chr, hex, input, next, oct, open, pow, round, super, bytes, list, object, range, str, max, min  # noqa: F401
 from past.builtins import unicode
 
 import time

src/allmydata/frontends/auth.py

@@ -2,10 +2,6 @@
 Authentication for frontends.
 """
 
-from future.utils import PY2
-if PY2:
-    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
-
 from zope.interface import implementer
 from twisted.internet import defer
 from twisted.cred import checkers, credentials

src/allmydata/frontends/sftpd.py

@@ -2,10 +2,6 @@
 Ported to Python 3.
 """
 
-from future.utils import PY2
-if PY2:
-    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
-
 import six
 import heapq, traceback, stat, struct
 from stat import S_IFREG, S_IFDIR

src/allmydata/hashtree.py

@@ -49,11 +49,6 @@ or eat  your children, but it might.  Use at your own risk.
 Ported to Python 3.
 """
 
-
-from future.utils import PY2
-if PY2:
-    from 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
-
 from allmydata.util import mathutil # from the pyutil library
 
 from allmydata.util import base32

src/allmydata/history.py

@@ -1,11 +1,6 @@
 """Ported to Python 3.
 """
 
-from future.utils import PY2
-if PY2:
-    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
-
-
 import weakref
 
 class History(object):

src/allmydata/immutable/checker.py

@@ -2,10 +2,6 @@
 Ported to Python 3.
 """
 
-from future.utils import PY2
-if PY2:
-    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
-
 from zope.interface import implementer
 from twisted.internet import defer
 from foolscap.api import DeadReferenceError, RemoteException

src/allmydata/immutable/downloader/__init__.py

@@ -1,9 +1,3 @@
 """
 Ported to Python 3.
 """
-
-
-from future.utils import PY2
-if PY2:
-    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
-

src/allmydata/immutable/downloader/common.py

@@ -2,11 +2,6 @@
 Ported to Python 3.
 """
 
-
-from future.utils import PY2
-if PY2:
-    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
-
 (AVAILABLE, PENDING, OVERDUE, COMPLETE, CORRUPT, DEAD, BADSEGNUM) = \
  ("AVAILABLE", "PENDING", "OVERDUE", "COMPLETE", "CORRUPT", "DEAD", "BADSEGNUM")
 

src/allmydata/immutable/downloader/fetcher.py

@@ -2,11 +2,6 @@
 Ported to Python 3.
 """
 
-
-from future.utils import PY2
-if PY2:
-    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
-
 from twisted.python.failure import Failure
 from foolscap.api import eventually
 from allmydata.interfaces import NotEnoughSharesError, NoSharesError

src/allmydata/immutable/downloader/finder.py

@@ -2,9 +2,6 @@
 Ported to Python 3.
 """
 
-from future.utils import PY2
-if PY2:
-    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
 from six import ensure_str
 
 import time

src/allmydata/immutable/downloader/node.py

@@ -2,10 +2,6 @@
 Ported to Python 3.
 """
 
-from future.utils import PY2
-if PY2:
-    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
-
 import time
 now = time.time
 from zope.interface import Interface

src/allmydata/immutable/downloader/segmentation.py

@@ -2,10 +2,6 @@
 Ported to Python 3.
 """
 
-from future.utils import PY2
-if PY2:
-    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
-
 import time
 now = time.time
 from zope.interface import implementer

src/allmydata/immutable/downloader/share.py

@@ -2,10 +2,6 @@
 Ported to Python 3.
 """
 
-from future.utils import PY2
-if PY2:
-    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
-
 import struct
 import time
 now = time.time

src/allmydata/immutable/downloader/status.py

@@ -2,10 +2,6 @@
 Ported to Python 3.
 """
 
-from future.utils import PY2
-if PY2:
-    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
-
 import itertools
 from zope.interface import implementer
 from allmydata.interfaces import IDownloadStatus

src/allmydata/immutable/encode.py

@@ -4,11 +4,6 @@
 Ported to Python 3.
 """
 
-
-from future.utils import PY2
-if PY2:
-    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
-
 import time
 from zope.interface import implementer
 from twisted.internet import defer

src/allmydata/immutable/filenode.py

@@ -2,11 +2,6 @@
 Ported to Python 3.
 """
 
-
-from future.utils import PY2
-if PY2:
-    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
-
 from functools import reduce
 import binascii
 from time import time as now

src/allmydata/immutable/happiness_upload.py

@@ -5,11 +5,6 @@ on.
 Ported to Python 3.
 """
 
-from future.utils import PY2
-if PY2:
-    # We omit dict, just in case newdict breaks things for external Python 2 code.
-    from builtins import filter, map, zip, ascii, chr, hex, input, next, oct, open, pow, round, super, bytes, list, object, range, str, max, min  # noqa: F401
-
 from queue import PriorityQueue
 
 

src/allmydata/immutable/literal.py

@@ -2,11 +2,6 @@
 Ported to Python 3.
 """
 
-
-from future.utils import PY2
-if PY2:
-    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
-
 from io import BytesIO
 
 from zope.interface import implementer

src/allmydata/immutable/offloaded.py

@@ -2,10 +2,6 @@
 Ported to Python 3.
 """
 
-from future.utils import PY2
-if PY2:
-    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
-
 import os, stat, time, weakref
 from zope.interface import implementer
 from twisted.internet import defer

src/allmydata/immutable/repairer.py

@@ -2,10 +2,6 @@
 Ported to Python 3.
 """
 
-from future.utils import PY2
-if PY2:
-    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
-
 from zope.interface import implementer
 from twisted.internet import defer
 from allmydata.storage.server import si_b2a

src/allmydata/interfaces.py

@@ -7,10 +7,6 @@ Note that for RemoteInterfaces, the __remote_name__ needs to be a native string
 """
 
 from future.utils import PY2, native_str
-if PY2:
-    # Don't import object/str/dict/etc. types, so we don't break any
-    # interfaces. Not importing open() because it triggers bogus flake8 error.
-    from builtins import filter, map, zip, ascii, chr, hex, input, next, oct, pow, round, super, range, max, min  # noqa: F401
 
 from past.builtins import long
 from typing import Dict

src/allmydata/introducer/__init__.py

@@ -2,12 +2,6 @@
 Ported to Python 3.
 """
 
-
-from future.utils import PY2
-if PY2:
-    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
-
-
 from allmydata.introducer.server import create_introducer
 
 # apparently need to support "old .tac files" that may have

src/allmydata/introducer/client.py

@@ -2,9 +2,6 @@
 Ported to Python 3.
 """
 
-from future.utils import PY2
-if PY2:
-    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
 from past.builtins import long
 
 from six import ensure_text, ensure_str

src/allmydata/introducer/common.py

@@ -2,10 +2,6 @@
 Ported to Python 3.
 """
 
-from future.utils import PY2
-if PY2:
-    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
-
 import re
 
 from foolscap.furl import decode_furl

src/allmydata/introducer/interfaces.py

@@ -4,9 +4,6 @@ Ported to Python 3.
 
 
 from future.utils import PY2, native_str
-if PY2:
-    # Omitted types (bytes etc.) so future variants don't confuse Foolscap.
-    from future.builtins import filter, map, zip, ascii, chr, hex, input, next, oct, open, pow, round, super, object, range, max, min  # noqa: F401
 
 from zope.interface import Interface
 from foolscap.api import StringConstraint, SetOf, DictOf, Any, \

src/allmydata/monitor.py

@@ -4,10 +4,6 @@ Manage status of long-running operations.
 Ported to Python 3.
 """
 
-from future.utils import PY2
-if PY2:
-    from 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
-
 from zope.interface import Interface, implementer
 from allmydata.util import observer
 

src/allmydata/mutable/checker.py

@@ -2,9 +2,6 @@
 Ported to Python 3.
 """
 
-from future.utils import PY2
-if PY2:
-    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
 from six import ensure_str
 
 from allmydata.uri import from_string

src/allmydata/mutable/layout.py

@@ -2,10 +2,6 @@
 Ported to Python 3.
 """
 
-from future.utils import PY2
-if PY2:
-    # Omit dict so Python 3 changes don't leak into API callers on Python 2.
-    from future.builtins import filter, map, zip, ascii, chr, hex, input, next, oct, open, pow, round, super, bytes, list, object, range, str, max, min  # noqa: F401
 from past.utils import old_div
 
 import struct

src/allmydata/mutable/publish.py

@@ -2,10 +2,6 @@
 Ported to Python 3.
 """
 
-from future.utils import PY2
-if PY2:
-    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
-
 import os, time
 from io import BytesIO
 from itertools import count

src/allmydata/mutable/repairer.py

@@ -2,10 +2,6 @@
 Ported to Python 3.
 """
 
-from future.utils import PY2
-if PY2:
-    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
-
 from zope.interface import implementer
 from twisted.internet import defer
 from allmydata.interfaces import IRepairResults, ICheckResults

src/allmydata/scripts/admin.py

@@ -2,10 +2,6 @@
 Ported to Python 3.
 """
 
-from future.utils import PY2
-if PY2:
-    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
-
 from six import ensure_binary
 
 from twisted.python import usage

src/allmydata/scripts/backupdb.py

@@ -2,10 +2,6 @@
 Ported to Python 3.
 """
 
-from future.utils import PY2
-if PY2:
-    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
-
 import os.path, sys, time, random, stat
 
 from allmydata.util.netstring import netstring

src/allmydata/scripts/default_nodedir.py

@@ -2,11 +2,6 @@
 Ported to Python 3.
 """
 
-
-from future.utils import PY2
-if PY2:
-    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
-
 import sys
 import six
 from allmydata.util.assertutil import precondition

src/allmydata/scripts/runner.py

@@ -107,27 +107,6 @@ def parse_options(argv, config=None):
     try:
         config.parseOptions(argv)
     except usage.error as e:
-        if six.PY2:
-            # On Python 2 the exception may hold non-ascii in a byte string.
-            # This makes it impossible to convert the exception to any kind of
-            # string using str() or unicode().  It could also hold non-ascii
-            # in a unicode string which still makes it difficult to convert it
-            # to a byte string later.
-            #
-            # So, reach inside and turn it into some entirely safe ascii byte
-            # strings that will survive being written to stdout without
-            # causing too much damage in the process.
-            #
-            # As a result, non-ascii will not be rendered correctly but
-            # instead as escape sequences.  At least this can go away when
-            # we're done with Python 2 support.
-            raise usage.error(*(
-                arg.encode("ascii", errors="backslashreplace")
-                if isinstance(arg, unicode)
-                else arg.decode("utf-8").encode("ascii", errors="backslashreplace")
-                for arg
-                in e.args
-            ))
         raise
     return config
 

src/allmydata/scripts/slow_operation.py

@@ -3,8 +3,6 @@ Ported to Python 3.
 """
 
 from future.utils import PY2, PY3
-if PY2:
-    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
 
 from six import ensure_str
 

src/allmydata/scripts/tahoe_add_alias.py

@@ -2,10 +2,6 @@
 Ported to Python 3.
 """
 
-from future.utils import PY2
-if PY2:
-    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
-
 import os.path
 import codecs
 

src/allmydata/scripts/tahoe_backup.py

@@ -2,10 +2,6 @@
 Ported to Python 3.
 """
 
-from future.utils import PY2
-if PY2:
-    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
-
 import os.path
 import time
 from urllib.parse import quote as url_quote

src/allmydata/scripts/tahoe_check.py

@@ -2,10 +2,6 @@
 Ported to Python 3.
 """
 
-from future.utils import PY2
-if PY2:
-    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
-
 from six import ensure_str, ensure_text
 
 from urllib.parse import quote as url_quote

src/allmydata/scripts/tahoe_cp.py

@@ -2,10 +2,6 @@
 Ported to Python 3.
 """
 
-from future.utils import PY2
-if PY2:
-    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
-
 import os.path
 from urllib.parse import quote as url_quote
 from collections import defaultdict

src/allmydata/scripts/tahoe_get.py

@@ -3,8 +3,6 @@ Ported to Python 3.
 """
 
 from future.utils import PY2, PY3
-if PY2:
-    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
 
 from urllib.parse import quote as url_quote
 from allmydata.scripts.common import get_alias, DEFAULT_ALIAS, escape_path, \

src/allmydata/scripts/tahoe_ls.py

@@ -2,10 +2,6 @@
 Ported to Python 3.
 """
 
-from future.utils import PY2
-if PY2:
-    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
-
 from six import ensure_text
 
 import time

src/allmydata/scripts/tahoe_manifest.py

@@ -3,8 +3,6 @@ Ported to Python 3.
 """
 
 from future.utils import PY2, PY3
-if PY2:
-    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
 
 from six import ensure_str
 

src/allmydata/scripts/tahoe_mkdir.py

@@ -2,10 +2,6 @@
 Ported to Python 3.
 """
 
-from future.utils import PY2
-if PY2:
-    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
-
 from urllib.parse import quote as url_quote
 from allmydata.scripts.common_http import do_http, check_http_error
 from allmydata.scripts.common import get_alias, DEFAULT_ALIAS, UnknownAliasError

src/allmydata/scripts/tahoe_mv.py

@@ -2,10 +2,6 @@
 Ported to Python 3.
 """
 
-from future.utils import PY2
-if PY2:
-    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
-
 import re
 from urllib.parse import quote as url_quote
 import json

src/allmydata/scripts/tahoe_run.py

@@ -2,10 +2,6 @@
 Ported to Python 3.
 """
 
-from future.utils import PY2
-if PY2:
-    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
-
 __all__ = [
     "RunOptions",
     "run",

src/allmydata/scripts/tahoe_status.py

@@ -2,10 +2,6 @@
 Ported to Python 3.
 """
 
-from future.utils import PY2
-if PY2:
-    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
-
 import os
 from sys import stdout as _sys_stdout
 from urllib.parse import urlencode

src/allmydata/scripts/tahoe_unlink.py

@@ -2,10 +2,6 @@
 Ported to Python 3.
 """
 
-from future.utils import PY2
-if PY2:
-    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
-
 from urllib.parse import quote as url_quote
 from allmydata.scripts.common_http import do_http, format_http_success, format_http_error
 from allmydata.scripts.common import get_alias, DEFAULT_ALIAS, escape_path, \

src/allmydata/scripts/tahoe_webopen.py

@@ -2,10 +2,6 @@
 Ported to Python 3.
 """
 
-from future.utils import PY2
-if PY2:
-    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
-
 from urllib.parse import quote as url_quote
 
 from allmydata.scripts.common import get_alias, DEFAULT_ALIAS, escape_path, \

src/allmydata/storage/common.py

@@ -3,8 +3,6 @@ Ported to Python 3.
 """
 
 from future.utils import PY2, PY3
-if PY2:
-    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
 
 import os.path
 from allmydata.util import base32

src/allmydata/storage/crawler.py

@@ -6,8 +6,6 @@ Ported to Python 3.
 
 
 from future.utils import PY2, PY3
-if PY2:
-    from 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
 
 import os
 import time

src/allmydata/storage/expirer.py

@@ -1,7 +1,3 @@
-
-from future.utils import PY2
-if PY2:
-    from 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
 import json
 import time
 import os

src/allmydata/storage/immutable.py

@@ -4,8 +4,6 @@ Ported to Python 3.
 
 
 from future.utils import PY2, bytes_to_native_str
-if PY2:
-    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
 
 import os, stat, struct, time
 

src/allmydata/storage/immutable_schema.py

@@ -2,11 +2,6 @@
 Ported to Python 3.
 """
 
-
-from future.utils import PY2
-if PY2:
-    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
-
 import struct
 
 import attr

src/allmydata/storage/lease.py

@@ -2,11 +2,6 @@
 Ported to Python 3.
 """
 
-
-from future.utils import PY2
-if PY2:
-    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
-
 import struct, time
 
 import attr

src/allmydata/storage/mutable.py

@@ -2,11 +2,6 @@
 Ported to Python 3.
 """
 
-
-from future.utils import PY2
-if PY2:
-    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
-
 import os, stat, struct
 
 from allmydata.interfaces import (

src/allmydata/storage/mutable_schema.py

@@ -2,11 +2,6 @@
 Ported to Python 3.
 """
 
-
-from future.utils import PY2
-if PY2:
-    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
-
 import struct
 
 import attr

src/allmydata/storage/shares.py

@@ -2,11 +2,6 @@
 Ported to Python 3.
 """
 
-
-from future.utils import PY2
-if PY2:
-    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
-
 from allmydata.storage.mutable import MutableShareFile
 from allmydata.storage.immutable import ShareFile
 

src/allmydata/test/__init__.py

@@ -16,10 +16,6 @@ some side-effects which make things better when the test suite runs.
 Ported to Python 3.
 """
 
-from future.utils import PY2
-if PY2:
-    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
-
 from traceback import extract_stack, format_list
 
 from foolscap.pb import Listener

src/allmydata/test/cli/common.py

@@ -2,10 +2,6 @@
 Ported to Python 3.
 """
 
-from future.utils import PY2
-if PY2:
-    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
-
 from six import ensure_str, ensure_text
 
 from ...scripts import runner

src/allmydata/test/cli/test_admin.py

@@ -2,10 +2,6 @@
 Ported to Python 3.
 """
 
-from future.utils import PY2
-if PY2:
-    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
-
 # We're going to override stdin/stderr, so want to match their behavior on respective Python versions.
 from io import StringIO
 

src/allmydata/test/cli/test_alias.py

@@ -2,10 +2,6 @@
 Ported to Python 3.
 """
 
-from future.utils import PY2
-if PY2:
-    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
-
 import json
 
 from twisted.trial import unittest

src/allmydata/test/cli/test_backup.py

@@ -3,8 +3,6 @@ Ported to Python 3.
 """
 
 from future.utils import PY2
-if PY2:
-    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
 
 import os.path
 from six.moves import cStringIO as StringIO
@@ -368,8 +366,6 @@ class Backup(GridTestMixin, CLITestMixin, StallMixin, unittest.TestCase):
         nice_doc = u"nice_d\u00F8c.lyx"
         try:
             doc_pattern_arg_unicode = doc_pattern_arg = u"*d\u00F8c*"
-            if PY2:
-                doc_pattern_arg = doc_pattern_arg.encode(get_io_encoding())
         except UnicodeEncodeError:
             raise unittest.SkipTest("A non-ASCII command argument could not be encoded on this platform.")
 

src/allmydata/test/cli/test_backupdb.py

@@ -2,11 +2,6 @@
 Ported to Python 3.
 """
 
-from future.utils import PY2
-if PY2:
-    # Don't import future bytes so we don't break a couple of tests
-    from future.builtins import filter, map, zip, ascii, chr, hex, input, next, oct, open, pow, round, super, dict, list, object, range, str, max, min  # noqa: F401
-
 import sys
 import os.path, time
 from six.moves import cStringIO as StringIO

src/allmydata/test/cli/test_check.py

@@ -1,7 +1,3 @@
-
-from future.utils import PY2
-if PY2:
-    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
 from six import ensure_text
 
 import os.path

src/allmydata/test/cli/test_cli.py

@@ -2,10 +2,6 @@
 Ported to Python 3.
 """
 
-from future.utils import PY2
-if PY2:
-    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
-
 from six.moves import cStringIO as StringIO
 import re
 from six import ensure_text

src/allmydata/test/cli/test_cp.py

@@ -2,10 +2,6 @@
 Ported to Python 3.
 """
 
-from future.utils import PY2
-if PY2:
-    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
-
 import os.path, json
 from twisted.trial import unittest
 from twisted.python import usage
@@ -73,8 +69,6 @@ class Cp(GridTestMixin, CLITestMixin, unittest.TestCase):
                 self.failUnlessIn("files whose names could not be converted", err)
             else:
                 self.failUnlessReallyEqual(rc, 0)
-                if PY2:
-                    out = out.decode(get_io_encoding())
                 self.failUnlessReallyEqual(out, u"Metallica\n\u00C4rtonwall\n\u00C4rtonwall-2\n")
                 self.assertEqual(len(err), 0, err)
         d.addCallback(_check)
@@ -231,8 +225,6 @@ class Cp(GridTestMixin, CLITestMixin, unittest.TestCase):
                 self.failUnlessIn("files whose names could not be converted", err)
             else:
                 self.failUnlessReallyEqual(rc, 0)
-                if PY2:
-                    out = out.decode(get_io_encoding())
                 self.failUnlessReallyEqual(out, u"\u00C4rtonwall\n")
                 self.assertEqual(len(err), 0, err)
         d.addCallback(_check)

src/allmydata/test/cli/test_create_alias.py

@@ -2,10 +2,6 @@
 Ported to Python 3.
 """
 
-from future.utils import PY2
-if PY2:
-    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
-
 from six.moves import StringIO
 import os.path
 from twisted.trial import unittest

src/allmydata/test/cli/test_list.py

@@ -3,8 +3,6 @@ Ported to Python 3.
 """
 
 from future.utils import PY2, PY3
-if PY2:
-    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
 from six import ensure_str
 
 from twisted.trial import unittest

src/allmydata/test/cli/test_mv.py

@@ -2,10 +2,6 @@
 Ported to Python 3.
 """
 
-from future.utils import PY2
-if PY2:
-    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
-
 import os.path
 from twisted.trial import unittest
 from allmydata.util import fileutil

src/allmydata/test/cli/test_status.py

@@ -2,9 +2,6 @@
 Ported to Python 3.
 """
 
-from future.utils import PY2
-if PY2:
-    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
 from six import ensure_text
 
 import os

src/allmydata/test/cli_node_api.py

@@ -2,10 +2,6 @@
 Ported to Python 3.
 """
 
-from future.utils import PY2
-if PY2:
-    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
-
 __all__ = [
     "CLINodeAPI",
     "Expect",

src/allmydata/test/common.py

@@ -1427,7 +1427,4 @@ class TrialTestCase(_TrialTestCase):
         you try to turn that Exception instance into a string.
         """
 
-        if six.PY2:
-            if isinstance(msg, six.text_type):
-                return super(TrialTestCase, self).fail(msg.encode("utf8"))
         return super(TrialTestCase, self).fail(msg)

src/allmydata/test/common_util.py

@@ -4,8 +4,6 @@ Ported to Python 3.
 
 from future.utils import PY2, PY3, bchr, binary_type
 from future.builtins import str as future_str
-if PY2:
-    from future.builtins import filter, map, zip, ascii, chr, hex, input, next, oct, open, pow, round, super, dict, list, object, range, str, max, min  # noqa: F401
 
 import os
 import sys

src/allmydata/test/common_web.py

@@ -2,10 +2,6 @@
 Ported to Python 3.
 """
 
-from future.utils import PY2
-if PY2:
-    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
-
 from six import ensure_str
 
 __all__ = [

src/allmydata/test/matchers.py

@@ -4,10 +4,6 @@ Testtools-style matchers useful to the Tahoe-LAFS test suite.
 Ported to Python 3.
 """
 
-from future.utils import PY2
-if PY2:
-    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
-
 import attr
 from hyperlink import DecodedURL
 

src/allmydata/test/mutable/test_checker.py

@@ -2,10 +2,6 @@
 Ported to Python 3.
 """
 
-from future.utils import PY2
-if PY2:
-    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
-
 from ..common import AsyncTestCase
 from foolscap.api import flushEventualQueue
 from allmydata.monitor import Monitor

src/allmydata/test/mutable/test_datahandle.py

@@ -2,10 +2,6 @@
 Ported to Python 3.
 """
 
-from future.utils import PY2
-if PY2:
-    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
-
 from ..common import SyncTestCase
 from allmydata.mutable.publish import MutableData
 from testtools.matchers import Equals, HasLength

src/allmydata/test/mutable/test_different_encoding.py

@@ -2,10 +2,6 @@
 Ported to Python 3.
 """
 
-from future.utils import PY2
-if PY2:
-    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
-
 from ..common import AsyncTestCase
 from .util import FakeStorage, make_nodemaker
 

src/allmydata/test/mutable/test_exceptions.py

@@ -2,11 +2,6 @@
 Ported to Python 3.
 """
 
-
-from future.utils import PY2
-if PY2:
-    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
-
 from ..common import SyncTestCase
 from allmydata.mutable.common import NeedMoreDataError, UncoordinatedWriteError
 

src/allmydata/test/mutable/test_filehandle.py

@@ -2,10 +2,6 @@
 Ported to Python 3.
 """
 
-from future.utils import PY2
-if PY2:
-    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
-
 import os
 from io import BytesIO
 from ..common import SyncTestCase

src/allmydata/test/mutable/test_filenode.py

@@ -2,10 +2,6 @@
 Ported to Python 3.
 """
 
-from future.utils import PY2
-if PY2:
-    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
-
 from six.moves import cStringIO as StringIO
 from twisted.internet import defer, reactor
 from ..common import AsyncBrokenTestCase

src/allmydata/test/mutable/test_interoperability.py

@@ -2,10 +2,6 @@
 Ported to Python 3.
 """
 
-from future.utils import PY2
-if PY2:
-    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
-
 import os, base64
 from ..common import AsyncTestCase
 from testtools.matchers import HasLength

src/allmydata/test/mutable/test_multiple_encodings.py

@@ -2,10 +2,6 @@
 Ported to Python 3.
 """
 
-from future.utils import PY2
-if PY2:
-    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
-
 from ..common import AsyncTestCase
 from testtools.matchers import Equals
 from allmydata.interfaces import SDMF_VERSION

src/allmydata/test/mutable/test_multiple_versions.py

@@ -2,10 +2,6 @@
 Ported to Python 3.
 """
 
-from future.utils import PY2
-if PY2:
-    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
-
 from ..common import AsyncTestCase
 from testtools.matchers import Equals, HasLength
 from allmydata.monitor import Monitor

src/allmydata/test/mutable/test_problems.py

@@ -2,10 +2,6 @@
 Ported to Python 3.
 """
 
-from future.utils import PY2
-if PY2:
-    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
-
 import os, base64
 from ..common import AsyncTestCase
 from testtools.matchers import HasLength