diff --git a/integration/test_aaa_aardvark.py b/integration/test_aaa_aardvark.py index 28ac4c412..e92403497 100644 --- a/integration/test_aaa_aardvark.py +++ b/integration/test_aaa_aardvark.py @@ -5,10 +5,6 @@ # You can safely skip any of these tests, it'll just appear to "take # longer" to start the first test as the fixtures get built -from __future__ import unicode_literals -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function from future.utils import PY2 if PY2: diff --git a/integration/test_sftp.py b/integration/test_sftp.py index 01ddfdf8a..2fdc7522e 100644 --- a/integration/test_sftp.py +++ b/integration/test_sftp.py @@ -10,10 +10,6 @@ These tests use Paramiko, rather than Twisted's Conch, because: 2. Its API is much simpler to use. """ -from __future__ import unicode_literals -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function from future.utils import PY2 if PY2: diff --git a/integration/test_streaming_logs.py b/integration/test_streaming_logs.py index 036d30715..f70a42ead 100644 --- a/integration/test_streaming_logs.py +++ b/integration/test_streaming_logs.py @@ -1,12 +1,6 @@ """ Ported to Python 3. """ -from __future__ import ( - print_function, - unicode_literals, - absolute_import, - division, -) from future.utils import PY2 if PY2: diff --git a/misc/awesome_weird_stuff/boodlegrid.tac b/misc/awesome_weird_stuff/boodlegrid.tac index f13427ceb..f03474756 100644 --- a/misc/awesome_weird_stuff/boodlegrid.tac +++ b/misc/awesome_weird_stuff/boodlegrid.tac @@ -1,6 +1,5 @@ # -*- python -*- -from __future__ import print_function """Monitor a Tahoe grid, by playing sounds in response to remote events. diff --git a/misc/build_helpers/check-build.py b/misc/build_helpers/check-build.py index 994ed650a..03fd53392 100644 --- a/misc/build_helpers/check-build.py +++ b/misc/build_helpers/check-build.py @@ -2,7 +2,6 @@ # This helper script is used with the 'test-desert-island' Makefile target. -from __future__ import print_function import sys diff --git a/misc/build_helpers/gen-package-table.py b/misc/build_helpers/gen-package-table.py index ebcfd1ecd..690e95739 100644 --- a/misc/build_helpers/gen-package-table.py +++ b/misc/build_helpers/gen-package-table.py @@ -2,7 +2,6 @@ # This script generates a table of dependencies in HTML format on stdout. # It expects to be run in the tahoe-lafs-dep-eggs directory. -from __future__ import print_function import re, os, sys import pkg_resources diff --git a/misc/build_helpers/run-deprecations.py b/misc/build_helpers/run-deprecations.py index 2ad335bd1..6338b7ccb 100644 --- a/misc/build_helpers/run-deprecations.py +++ b/misc/build_helpers/run-deprecations.py @@ -1,4 +1,3 @@ -from __future__ import print_function import sys, os, io, re from twisted.internet import reactor, protocol, task, defer diff --git a/misc/build_helpers/test-osx-pkg.py b/misc/build_helpers/test-osx-pkg.py index aaf7bb47a..6dc51eeaf 100644 --- a/misc/build_helpers/test-osx-pkg.py +++ b/misc/build_helpers/test-osx-pkg.py @@ -29,7 +29,6 @@ # characteristic: 14.1.0 (/Applications/tahoe.app/support/lib/python2.7/site-packages) # pyasn1-modules: 0.0.5 (/Applications/tahoe.app/support/lib/python2.7/site-packages/pyasn1_modules-0.0.5-py2.7.egg) -from __future__ import print_function import os, re, shutil, subprocess, sys, tempfile diff --git a/misc/checkers/check_grid.py b/misc/checkers/check_grid.py index 0a68ed899..189e5a260 100644 --- a/misc/checkers/check_grid.py +++ b/misc/checkers/check_grid.py @@ -1,4 +1,3 @@ -from __future__ import print_function """ Test an existing Tahoe grid, both to see if the grid is still running and to diff --git a/misc/coding_tools/check-debugging.py b/misc/coding_tools/check-debugging.py index b920f5634..6bd54fee3 100755 --- a/misc/coding_tools/check-debugging.py +++ b/misc/coding_tools/check-debugging.py @@ -8,7 +8,6 @@ Runs on Python 3. Usage: ./check-debugging.py src """ -from __future__ import print_function import sys, re, os diff --git a/misc/coding_tools/check-interfaces.py b/misc/coding_tools/check-interfaces.py index 66bdf808f..d2657877a 100644 --- a/misc/coding_tools/check-interfaces.py +++ b/misc/coding_tools/check-interfaces.py @@ -4,7 +4,6 @@ # # bin/tahoe @misc/coding_tools/check-interfaces.py -from __future__ import print_function import os, sys, re, platform diff --git a/misc/coding_tools/check-umids.py b/misc/coding_tools/check-umids.py index 345610f3e..1ef557cee 100644 --- a/misc/coding_tools/check-umids.py +++ b/misc/coding_tools/check-umids.py @@ -8,7 +8,6 @@ This runs on Python 3. # ./check-umids.py src -from __future__ import print_function import sys, re, os diff --git a/misc/coding_tools/graph-deps.py b/misc/coding_tools/graph-deps.py index ad049093c..400f3912a 100755 --- a/misc/coding_tools/graph-deps.py +++ b/misc/coding_tools/graph-deps.py @@ -21,7 +21,6 @@ # Install 'click' first. I run this with py2, but py3 might work too, if the # wheels can be built with py3. -from __future__ import unicode_literals, print_function import os, sys, subprocess, json, tempfile, zipfile, re, itertools import email.parser from pprint import pprint diff --git a/misc/coding_tools/make-canary-files.py b/misc/coding_tools/make-canary-files.py index 89f274b38..018462892 100644 --- a/misc/coding_tools/make-canary-files.py +++ b/misc/coding_tools/make-canary-files.py @@ -1,6 +1,5 @@ #!/usr/bin/env python -from __future__ import print_function """ Given a list of nodeids and a 'convergence' file, create a bunch of files diff --git a/misc/coding_tools/make_umid b/misc/coding_tools/make_umid index 6b1759681..870ece1c6 100644 --- a/misc/coding_tools/make_umid +++ b/misc/coding_tools/make_umid @@ -1,6 +1,5 @@ #!/usr/bin/env python -from __future__ import print_function """Create a short probably-unique string for use as a umid= argument in a Foolscap log() call, to make it easier to locate the source code that diff --git a/misc/operations_helpers/cpu-watcher-poll.py b/misc/operations_helpers/cpu-watcher-poll.py index 320dd8ad7..0ecf974c6 100644 --- a/misc/operations_helpers/cpu-watcher-poll.py +++ b/misc/operations_helpers/cpu-watcher-poll.py @@ -1,6 +1,5 @@ #!/usr/bin/env python -from __future__ import print_function from foolscap import Tub, eventual from twisted.internet import reactor diff --git a/misc/operations_helpers/cpu-watcher-subscribe.py b/misc/operations_helpers/cpu-watcher-subscribe.py index 36a69cac7..ce486832f 100644 --- a/misc/operations_helpers/cpu-watcher-subscribe.py +++ b/misc/operations_helpers/cpu-watcher-subscribe.py @@ -1,6 +1,5 @@ # -*- python -*- -from __future__ import print_function from twisted.internet import reactor import sys diff --git a/misc/operations_helpers/cpu-watcher.tac b/misc/operations_helpers/cpu-watcher.tac index c50b51c61..140625d58 100644 --- a/misc/operations_helpers/cpu-watcher.tac +++ b/misc/operations_helpers/cpu-watcher.tac @@ -1,6 +1,5 @@ # -*- python -*- -from __future__ import print_function """ # run this tool on a linux box in its own directory, with a file named diff --git a/misc/operations_helpers/find-share-anomalies.py b/misc/operations_helpers/find-share-anomalies.py index d689a8c99..e3826cc69 100644 --- a/misc/operations_helpers/find-share-anomalies.py +++ b/misc/operations_helpers/find-share-anomalies.py @@ -2,7 +2,6 @@ # feed this the results of 'tahoe catalog-shares' for all servers -from __future__ import print_function import sys diff --git a/misc/operations_helpers/munin/tahoe_cpu_watcher b/misc/operations_helpers/munin/tahoe_cpu_watcher index 8f2876792..ca7e40a32 100644 --- a/misc/operations_helpers/munin/tahoe_cpu_watcher +++ b/misc/operations_helpers/munin/tahoe_cpu_watcher @@ -1,6 +1,5 @@ #!/usr/bin/env python -from __future__ import print_function import os, sys, re import urllib diff --git a/misc/operations_helpers/munin/tahoe_diskleft b/misc/operations_helpers/munin/tahoe_diskleft index d5ce04b1a..b08422575 100644 --- a/misc/operations_helpers/munin/tahoe_diskleft +++ b/misc/operations_helpers/munin/tahoe_diskleft @@ -5,7 +5,6 @@ # is left on all disks across the grid. The plugin should be configured with # env_url= pointing at the diskwatcher.tac webport. -from __future__ import print_function import os, sys, urllib, json diff --git a/misc/operations_helpers/munin/tahoe_disktotal b/misc/operations_helpers/munin/tahoe_disktotal index b6d1a99e6..801eac164 100644 --- a/misc/operations_helpers/munin/tahoe_disktotal +++ b/misc/operations_helpers/munin/tahoe_disktotal @@ -6,7 +6,6 @@ # used. The plugin should be configured with env_url= pointing at the # diskwatcher.tac webport. -from __future__ import print_function import os, sys, urllib, json diff --git a/misc/operations_helpers/munin/tahoe_diskusage b/misc/operations_helpers/munin/tahoe_diskusage index cc37af3df..7eadd8eeb 100644 --- a/misc/operations_helpers/munin/tahoe_diskusage +++ b/misc/operations_helpers/munin/tahoe_diskusage @@ -5,7 +5,6 @@ # is being used per unit time. The plugin should be configured with env_url= # pointing at the diskwatcher.tac webport. -from __future__ import print_function import os, sys, urllib, json diff --git a/misc/operations_helpers/munin/tahoe_diskused b/misc/operations_helpers/munin/tahoe_diskused index 26303af86..151dc826e 100644 --- a/misc/operations_helpers/munin/tahoe_diskused +++ b/misc/operations_helpers/munin/tahoe_diskused @@ -5,7 +5,6 @@ # used on all disks across the grid. The plugin should be configured with # env_url= pointing at the diskwatcher.tac webport. -from __future__ import print_function import os, sys, urllib, json diff --git a/misc/operations_helpers/munin/tahoe_doomsday b/misc/operations_helpers/munin/tahoe_doomsday index 5a87489c2..348b244fe 100644 --- a/misc/operations_helpers/munin/tahoe_doomsday +++ b/misc/operations_helpers/munin/tahoe_doomsday @@ -5,7 +5,6 @@ # left before the grid fills up. The plugin should be configured with # env_url= pointing at the diskwatcher.tac webport. -from __future__ import print_function import os, sys, urllib, json diff --git a/misc/operations_helpers/munin/tahoe_estimate_files b/misc/operations_helpers/munin/tahoe_estimate_files index 1dda5affb..e6b6eff5d 100644 --- a/misc/operations_helpers/munin/tahoe_estimate_files +++ b/misc/operations_helpers/munin/tahoe_estimate_files @@ -1,6 +1,5 @@ #!/usr/bin/env python -from __future__ import print_function import sys, os.path diff --git a/misc/operations_helpers/munin/tahoe_files b/misc/operations_helpers/munin/tahoe_files index ec3ee5073..d951985a8 100644 --- a/misc/operations_helpers/munin/tahoe_files +++ b/misc/operations_helpers/munin/tahoe_files @@ -18,7 +18,6 @@ # env.basedir_NODE3 /path/to/node3 # -from __future__ import print_function import os, sys diff --git a/misc/operations_helpers/munin/tahoe_helperstats_active b/misc/operations_helpers/munin/tahoe_helperstats_active index ba1032acb..315a00886 100644 --- a/misc/operations_helpers/munin/tahoe_helperstats_active +++ b/misc/operations_helpers/munin/tahoe_helperstats_active @@ -1,6 +1,5 @@ #!/usr/bin/env python -from __future__ import print_function import os, sys import urllib diff --git a/misc/operations_helpers/munin/tahoe_helperstats_fetched b/misc/operations_helpers/munin/tahoe_helperstats_fetched index 5f53bb82c..f9577427c 100644 --- a/misc/operations_helpers/munin/tahoe_helperstats_fetched +++ b/misc/operations_helpers/munin/tahoe_helperstats_fetched @@ -1,6 +1,5 @@ #!/usr/bin/env python -from __future__ import print_function import os, sys import urllib diff --git a/misc/operations_helpers/munin/tahoe_introstats b/misc/operations_helpers/munin/tahoe_introstats index 0373c70e2..5dd07f62d 100644 --- a/misc/operations_helpers/munin/tahoe_introstats +++ b/misc/operations_helpers/munin/tahoe_introstats @@ -1,6 +1,5 @@ #!/usr/bin/env python -from __future__ import print_function import os, sys import urllib diff --git a/misc/operations_helpers/munin/tahoe_nodememory b/misc/operations_helpers/munin/tahoe_nodememory index 061a50dc2..71463c031 100644 --- a/misc/operations_helpers/munin/tahoe_nodememory +++ b/misc/operations_helpers/munin/tahoe_nodememory @@ -4,7 +4,6 @@ # by 'allmydata start', then extracts the amount of memory they consume (both # VmSize and VmRSS) from /proc -from __future__ import print_function import os, sys, re diff --git a/misc/operations_helpers/munin/tahoe_overhead b/misc/operations_helpers/munin/tahoe_overhead index 40640d189..6a25bcd46 100644 --- a/misc/operations_helpers/munin/tahoe_overhead +++ b/misc/operations_helpers/munin/tahoe_overhead @@ -27,7 +27,6 @@ # This plugin should be configured with env_diskwatcher_url= pointing at the # diskwatcher.tac webport, and env_deepsize_url= pointing at the PHP script. -from __future__ import print_function import os, sys, urllib, json diff --git a/misc/operations_helpers/munin/tahoe_rootdir_space b/misc/operations_helpers/munin/tahoe_rootdir_space index 1f5709206..ca61ddb13 100644 --- a/misc/operations_helpers/munin/tahoe_rootdir_space +++ b/misc/operations_helpers/munin/tahoe_rootdir_space @@ -1,6 +1,5 @@ #!/usr/bin/env python -from __future__ import print_function import os, sys import urllib diff --git a/misc/operations_helpers/munin/tahoe_server_latency_ b/misc/operations_helpers/munin/tahoe_server_latency_ index c8930804c..4c9a79a7a 100644 --- a/misc/operations_helpers/munin/tahoe_server_latency_ +++ b/misc/operations_helpers/munin/tahoe_server_latency_ @@ -42,7 +42,6 @@ # of course, these URLs must match the webports you have configured into the # storage nodes. -from __future__ import print_function import os, sys import urllib diff --git a/misc/operations_helpers/munin/tahoe_server_operations_ b/misc/operations_helpers/munin/tahoe_server_operations_ index 6156a7f48..cdf0409dd 100644 --- a/misc/operations_helpers/munin/tahoe_server_operations_ +++ b/misc/operations_helpers/munin/tahoe_server_operations_ @@ -32,7 +32,6 @@ # of course, these URLs must match the webports you have configured into the # storage nodes. -from __future__ import print_function import os, sys import urllib diff --git a/misc/operations_helpers/munin/tahoe_spacetime b/misc/operations_helpers/munin/tahoe_spacetime index 12b5121bf..e3a058851 100644 --- a/misc/operations_helpers/munin/tahoe_spacetime +++ b/misc/operations_helpers/munin/tahoe_spacetime @@ -5,7 +5,6 @@ # then extrapolate to guess how many weeks/months/years of storage space we # have left, and output it to another munin graph -from __future__ import print_function import sys, os, time import rrdtool diff --git a/misc/operations_helpers/munin/tahoe_stats b/misc/operations_helpers/munin/tahoe_stats index 03bf116f5..f94dd5b36 100644 --- a/misc/operations_helpers/munin/tahoe_stats +++ b/misc/operations_helpers/munin/tahoe_stats @@ -1,6 +1,5 @@ #!/usr/bin/env python -from __future__ import print_function import os import json diff --git a/misc/operations_helpers/munin/tahoe_storagespace b/misc/operations_helpers/munin/tahoe_storagespace index 73443b428..318283244 100644 --- a/misc/operations_helpers/munin/tahoe_storagespace +++ b/misc/operations_helpers/munin/tahoe_storagespace @@ -18,7 +18,6 @@ # Allmydata-tahoe must be installed on the system where this plugin is used, # since it imports a utility module from allmydata.utils . -from __future__ import print_function import os, sys import commands diff --git a/misc/operations_helpers/provisioning/reliability.py b/misc/operations_helpers/provisioning/reliability.py index fe274c875..c31e398e0 100644 --- a/misc/operations_helpers/provisioning/reliability.py +++ b/misc/operations_helpers/provisioning/reliability.py @@ -1,6 +1,5 @@ #! /usr/bin/python -from __future__ import print_function import math from allmydata.util import statistics diff --git a/misc/operations_helpers/provisioning/test_provisioning.py b/misc/operations_helpers/provisioning/test_provisioning.py index 2b71c8566..5d46f704e 100644 --- a/misc/operations_helpers/provisioning/test_provisioning.py +++ b/misc/operations_helpers/provisioning/test_provisioning.py @@ -1,4 +1,3 @@ -from __future__ import print_function import unittest from allmydata import provisioning diff --git a/misc/operations_helpers/spacetime/diskwatcher.tac b/misc/operations_helpers/spacetime/diskwatcher.tac index 0a43a468e..22c1f8747 100644 --- a/misc/operations_helpers/spacetime/diskwatcher.tac +++ b/misc/operations_helpers/spacetime/diskwatcher.tac @@ -1,6 +1,5 @@ # -*- python -*- -from __future__ import print_function """ Run this tool with twistd in its own directory, with a file named 'urls.txt' diff --git a/misc/simulators/bench_spans.py b/misc/simulators/bench_spans.py index c696dac1e..6bc4f045e 100644 --- a/misc/simulators/bench_spans.py +++ b/misc/simulators/bench_spans.py @@ -1,4 +1,3 @@ -from __future__ import print_function """ To use this, get a trace file such as this one: diff --git a/misc/simulators/count_dirs.py b/misc/simulators/count_dirs.py index 22eda8917..62045d1e2 100644 --- a/misc/simulators/count_dirs.py +++ b/misc/simulators/count_dirs.py @@ -1,6 +1,5 @@ #!/usr/bin/env python -from __future__ import print_function """ This tool estimates how much space would be consumed by a filetree into which diff --git a/misc/simulators/hashbasedsig.py b/misc/simulators/hashbasedsig.py index dbb9ca504..fff92b681 100644 --- a/misc/simulators/hashbasedsig.py +++ b/misc/simulators/hashbasedsig.py @@ -1,6 +1,5 @@ #!python -from __future__ import print_function # range of hash output lengths range_L_hash = [128] diff --git a/misc/simulators/ringsim.py b/misc/simulators/ringsim.py index e6616351c..889785bb4 100644 --- a/misc/simulators/ringsim.py +++ b/misc/simulators/ringsim.py @@ -4,7 +4,6 @@ # import time -from __future__ import print_function import math from hashlib import md5 # sha1, sha256 diff --git a/misc/simulators/simulate_load.py b/misc/simulators/simulate_load.py index ed80ab842..989711207 100644 --- a/misc/simulators/simulate_load.py +++ b/misc/simulators/simulate_load.py @@ -2,7 +2,6 @@ # WARNING. There is a bug in this script so that it does not simulate the actual Tahoe Two server selection algorithm that it was intended to simulate. See http://allmydata.org/trac/tahoe-lafs/ticket/302 (stop permuting peerlist, use SI as offset into ring instead?) -from __future__ import print_function from past.builtins import cmp diff --git a/misc/simulators/simulator.py b/misc/simulators/simulator.py index ceeb05edf..b2f51b0e1 100644 --- a/misc/simulators/simulator.py +++ b/misc/simulators/simulator.py @@ -1,6 +1,5 @@ #! /usr/bin/env python -from __future__ import print_function import hashlib import os, random diff --git a/misc/simulators/sizes.py b/misc/simulators/sizes.py index eb5f3adbf..4b4f6d1fd 100644 --- a/misc/simulators/sizes.py +++ b/misc/simulators/sizes.py @@ -1,6 +1,5 @@ #! /usr/bin/env python -from __future__ import print_function from future.utils import PY2 if PY2: diff --git a/misc/simulators/storage-overhead.py b/misc/simulators/storage-overhead.py index 9959f5575..096c18fba 100644 --- a/misc/simulators/storage-overhead.py +++ b/misc/simulators/storage-overhead.py @@ -1,6 +1,5 @@ #!/usr/bin/env python -from __future__ import print_function import sys, math from allmydata import uri, storage diff --git a/pyinstaller.spec b/pyinstaller.spec index 01b1ac4ac..5c24df430 100644 --- a/pyinstaller.spec +++ b/pyinstaller.spec @@ -1,6 +1,5 @@ # -*- mode: python -*- -from __future__ import print_function from distutils.sysconfig import get_python_lib import hashlib diff --git a/src/allmydata/__main__.py b/src/allmydata/__main__.py index 87f1f6522..972167b30 100644 --- a/src/allmydata/__main__.py +++ b/src/allmydata/__main__.py @@ -2,10 +2,6 @@ Ported to Python 3. """ -from __future__ import unicode_literals -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function from future.utils import PY2 if PY2: diff --git a/src/allmydata/_monkeypatch.py b/src/allmydata/_monkeypatch.py index da37fd979..520a4194a 100644 --- a/src/allmydata/_monkeypatch.py +++ b/src/allmydata/_monkeypatch.py @@ -4,10 +4,6 @@ Monkey-patching of third party libraries. Ported to Python 3. """ -from __future__ import unicode_literals -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function from future.utils import PY2 if PY2: diff --git a/src/allmydata/blacklist.py b/src/allmydata/blacklist.py index 43eb36cc6..a019ccb69 100644 --- a/src/allmydata/blacklist.py +++ b/src/allmydata/blacklist.py @@ -1,10 +1,6 @@ """ Ported to Python 3. """ -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: diff --git a/src/allmydata/check_results.py b/src/allmydata/check_results.py index 4f997b614..1dbf2f7d5 100644 --- a/src/allmydata/check_results.py +++ b/src/allmydata/check_results.py @@ -1,9 +1,5 @@ """Ported to Python 3. """ -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: diff --git a/src/allmydata/codec.py b/src/allmydata/codec.py index af375a117..b58ebae57 100644 --- a/src/allmydata/codec.py +++ b/src/allmydata/codec.py @@ -3,10 +3,6 @@ CRS encoding and decoding. Ported to Python 3. """ -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: diff --git a/src/allmydata/crypto/__init__.py b/src/allmydata/crypto/__init__.py index 04b8f0cc3..3ba70e605 100644 --- a/src/allmydata/crypto/__init__.py +++ b/src/allmydata/crypto/__init__.py @@ -9,10 +9,6 @@ objects that `cryptography` documents. Ported to Python 3. """ -from __future__ import unicode_literals -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function from future.utils import PY2 if PY2: diff --git a/src/allmydata/crypto/aes.py b/src/allmydata/crypto/aes.py index ad7cfcba4..6e1b93c03 100644 --- a/src/allmydata/crypto/aes.py +++ b/src/allmydata/crypto/aes.py @@ -9,10 +9,6 @@ objects that `cryptography` documents. Ported to Python 3. """ -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: diff --git a/src/allmydata/crypto/error.py b/src/allmydata/crypto/error.py index 153e48d33..ea3f78162 100644 --- a/src/allmydata/crypto/error.py +++ b/src/allmydata/crypto/error.py @@ -3,10 +3,6 @@ Exceptions raise by allmydata.crypto.* modules Ported to Python 3. """ -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: diff --git a/src/allmydata/crypto/util.py b/src/allmydata/crypto/util.py index 8b8619e47..20f4bca85 100644 --- a/src/allmydata/crypto/util.py +++ b/src/allmydata/crypto/util.py @@ -3,10 +3,6 @@ Utilities used by allmydata.crypto modules Ported to Python 3. """ -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: diff --git a/src/allmydata/deep_stats.py b/src/allmydata/deep_stats.py index bfb43ebae..a80abe508 100644 --- a/src/allmydata/deep_stats.py +++ b/src/allmydata/deep_stats.py @@ -2,10 +2,6 @@ Ported to Python 3. """ -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: diff --git a/src/allmydata/dirnode.py b/src/allmydata/dirnode.py index ccd045b05..67e44faf4 100644 --- a/src/allmydata/dirnode.py +++ b/src/allmydata/dirnode.py @@ -2,10 +2,6 @@ Ported to Python 3. """ -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: diff --git a/src/allmydata/frontends/auth.py b/src/allmydata/frontends/auth.py index b6f9c2b7e..6d58cf567 100644 --- a/src/allmydata/frontends/auth.py +++ b/src/allmydata/frontends/auth.py @@ -1,10 +1,6 @@ """ Authentication for frontends. """ -from __future__ import unicode_literals -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function from future.utils import PY2 if PY2: diff --git a/src/allmydata/frontends/sftpd.py b/src/allmydata/frontends/sftpd.py index 7ef9a8820..e3c0eb674 100644 --- a/src/allmydata/frontends/sftpd.py +++ b/src/allmydata/frontends/sftpd.py @@ -1,10 +1,6 @@ """ Ported to Python 3. """ -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: diff --git a/src/allmydata/hashtree.py b/src/allmydata/hashtree.py index 57bdbd9a1..ca043f234 100644 --- a/src/allmydata/hashtree.py +++ b/src/allmydata/hashtree.py @@ -49,10 +49,6 @@ or eat your children, but it might. Use at your own risk. Ported to Python 3. """ -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: diff --git a/src/allmydata/history.py b/src/allmydata/history.py index 06a22ab5d..5629d7c43 100644 --- a/src/allmydata/history.py +++ b/src/allmydata/history.py @@ -1,9 +1,5 @@ """Ported to Python 3. """ -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: diff --git a/src/allmydata/immutable/checker.py b/src/allmydata/immutable/checker.py index 30abc68c6..0e8ba14d8 100644 --- a/src/allmydata/immutable/checker.py +++ b/src/allmydata/immutable/checker.py @@ -1,10 +1,6 @@ """ Ported to Python 3. """ -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: diff --git a/src/allmydata/immutable/downloader/__init__.py b/src/allmydata/immutable/downloader/__init__.py index 2d3d9e2a4..84d6b71f9 100644 --- a/src/allmydata/immutable/downloader/__init__.py +++ b/src/allmydata/immutable/downloader/__init__.py @@ -2,10 +2,6 @@ Ported to Python 3. """ -from __future__ import unicode_literals -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function from future.utils import PY2 if PY2: diff --git a/src/allmydata/immutable/downloader/common.py b/src/allmydata/immutable/downloader/common.py index 71430b0d7..e0d1fe3af 100644 --- a/src/allmydata/immutable/downloader/common.py +++ b/src/allmydata/immutable/downloader/common.py @@ -2,10 +2,6 @@ Ported to Python 3. """ -from __future__ import unicode_literals -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function from future.utils import PY2 if PY2: diff --git a/src/allmydata/immutable/downloader/fetcher.py b/src/allmydata/immutable/downloader/fetcher.py index 130bb93dc..ccffa4889 100644 --- a/src/allmydata/immutable/downloader/fetcher.py +++ b/src/allmydata/immutable/downloader/fetcher.py @@ -2,10 +2,6 @@ Ported to Python 3. """ -from __future__ import print_function -from __future__ import absolute_import -from __future__ import division -from __future__ import unicode_literals from future.utils import PY2 if PY2: diff --git a/src/allmydata/immutable/downloader/finder.py b/src/allmydata/immutable/downloader/finder.py index 4f6d1aa14..1992e72c1 100644 --- a/src/allmydata/immutable/downloader/finder.py +++ b/src/allmydata/immutable/downloader/finder.py @@ -1,10 +1,6 @@ """ Ported to Python 3. """ -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: diff --git a/src/allmydata/immutable/downloader/node.py b/src/allmydata/immutable/downloader/node.py index 102d29a0a..3c69b4084 100644 --- a/src/allmydata/immutable/downloader/node.py +++ b/src/allmydata/immutable/downloader/node.py @@ -1,10 +1,6 @@ """ Ported to Python 3. """ -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: diff --git a/src/allmydata/immutable/downloader/segmentation.py b/src/allmydata/immutable/downloader/segmentation.py index 6d7cb7676..4691f2602 100644 --- a/src/allmydata/immutable/downloader/segmentation.py +++ b/src/allmydata/immutable/downloader/segmentation.py @@ -1,10 +1,6 @@ """ Ported to Python 3. """ -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: diff --git a/src/allmydata/immutable/downloader/share.py b/src/allmydata/immutable/downloader/share.py index 016f1c34d..02e8554d4 100644 --- a/src/allmydata/immutable/downloader/share.py +++ b/src/allmydata/immutable/downloader/share.py @@ -1,10 +1,6 @@ """ Ported to Python 3. """ -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: diff --git a/src/allmydata/immutable/downloader/status.py b/src/allmydata/immutable/downloader/status.py index 425f6893c..11b3e88a7 100644 --- a/src/allmydata/immutable/downloader/status.py +++ b/src/allmydata/immutable/downloader/status.py @@ -1,10 +1,6 @@ """ Ported to Python 3. """ -from __future__ import division -from __future__ import absolute_import -from __future__ import print_function -from __future__ import unicode_literals from future.utils import PY2 if PY2: diff --git a/src/allmydata/immutable/encode.py b/src/allmydata/immutable/encode.py index 2414527ff..b838e71e1 100644 --- a/src/allmydata/immutable/encode.py +++ b/src/allmydata/immutable/encode.py @@ -4,10 +4,6 @@ Ported to Python 3. """ -from __future__ import division -from __future__ import absolute_import -from __future__ import print_function -from __future__ import unicode_literals from future.utils import PY2 if PY2: diff --git a/src/allmydata/immutable/filenode.py b/src/allmydata/immutable/filenode.py index 6962c31a4..761e663dd 100644 --- a/src/allmydata/immutable/filenode.py +++ b/src/allmydata/immutable/filenode.py @@ -2,10 +2,6 @@ Ported to Python 3. """ -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: diff --git a/src/allmydata/immutable/happiness_upload.py b/src/allmydata/immutable/happiness_upload.py index 3e3eedbc9..2bc0016b0 100644 --- a/src/allmydata/immutable/happiness_upload.py +++ b/src/allmydata/immutable/happiness_upload.py @@ -4,10 +4,6 @@ on. Ported to Python 3. """ -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: diff --git a/src/allmydata/immutable/literal.py b/src/allmydata/immutable/literal.py index 544a205e1..1ae2743f8 100644 --- a/src/allmydata/immutable/literal.py +++ b/src/allmydata/immutable/literal.py @@ -2,10 +2,6 @@ Ported to Python 3. """ -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: diff --git a/src/allmydata/immutable/offloaded.py b/src/allmydata/immutable/offloaded.py index 8ce51782c..a98d3372b 100644 --- a/src/allmydata/immutable/offloaded.py +++ b/src/allmydata/immutable/offloaded.py @@ -1,10 +1,6 @@ """ Ported to Python 3. """ -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: diff --git a/src/allmydata/immutable/repairer.py b/src/allmydata/immutable/repairer.py index bccd8453d..87873369a 100644 --- a/src/allmydata/immutable/repairer.py +++ b/src/allmydata/immutable/repairer.py @@ -1,10 +1,6 @@ """ Ported to Python 3. """ -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: diff --git a/src/allmydata/interfaces.py b/src/allmydata/interfaces.py index 0f00c5417..7bfcc9a13 100644 --- a/src/allmydata/interfaces.py +++ b/src/allmydata/interfaces.py @@ -5,10 +5,6 @@ Ported to Python 3. Note that for RemoteInterfaces, the __remote_name__ needs to be a native string because of https://github.com/warner/foolscap/blob/43f4485a42c9c28e2c79d655b3a9e24d4e6360ca/src/foolscap/remoteinterface.py#L67 """ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals from future.utils import PY2, native_str if PY2: diff --git a/src/allmydata/introducer/__init__.py b/src/allmydata/introducer/__init__.py index bfc960e05..d654f6c89 100644 --- a/src/allmydata/introducer/__init__.py +++ b/src/allmydata/introducer/__init__.py @@ -2,10 +2,6 @@ Ported to Python 3. """ -from __future__ import unicode_literals -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function from future.utils import PY2 if PY2: diff --git a/src/allmydata/introducer/client.py b/src/allmydata/introducer/client.py index a64596f0e..4c8abff60 100644 --- a/src/allmydata/introducer/client.py +++ b/src/allmydata/introducer/client.py @@ -1,10 +1,6 @@ """ Ported to Python 3. """ -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: diff --git a/src/allmydata/introducer/common.py b/src/allmydata/introducer/common.py index f6f70d861..21b16a599 100644 --- a/src/allmydata/introducer/common.py +++ b/src/allmydata/introducer/common.py @@ -1,10 +1,6 @@ """ Ported to Python 3. """ -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: diff --git a/src/allmydata/introducer/interfaces.py b/src/allmydata/introducer/interfaces.py index 24fd3945f..ca97b425f 100644 --- a/src/allmydata/introducer/interfaces.py +++ b/src/allmydata/introducer/interfaces.py @@ -2,10 +2,6 @@ Ported to Python 3. """ -from __future__ import unicode_literals -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function from future.utils import PY2, native_str if PY2: diff --git a/src/allmydata/monitor.py b/src/allmydata/monitor.py index 1559a30d9..c2aae826e 100644 --- a/src/allmydata/monitor.py +++ b/src/allmydata/monitor.py @@ -3,10 +3,6 @@ Manage status of long-running operations. Ported to Python 3. """ -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: diff --git a/src/allmydata/mutable/checker.py b/src/allmydata/mutable/checker.py index 0899168c3..ee57e2ed9 100644 --- a/src/allmydata/mutable/checker.py +++ b/src/allmydata/mutable/checker.py @@ -1,10 +1,6 @@ """ Ported to Python 3. """ -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: diff --git a/src/allmydata/mutable/layout.py b/src/allmydata/mutable/layout.py index 8bb2f3083..9057745e7 100644 --- a/src/allmydata/mutable/layout.py +++ b/src/allmydata/mutable/layout.py @@ -1,10 +1,6 @@ """ Ported to Python 3. """ -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: diff --git a/src/allmydata/mutable/publish.py b/src/allmydata/mutable/publish.py index e57652467..9df1d20b2 100644 --- a/src/allmydata/mutable/publish.py +++ b/src/allmydata/mutable/publish.py @@ -1,10 +1,6 @@ """ Ported to Python 3. """ -from __future__ import division -from __future__ import absolute_import -from __future__ import print_function -from __future__ import unicode_literals from future.utils import PY2 if PY2: diff --git a/src/allmydata/mutable/repairer.py b/src/allmydata/mutable/repairer.py index 23af02203..5c6537769 100644 --- a/src/allmydata/mutable/repairer.py +++ b/src/allmydata/mutable/repairer.py @@ -1,10 +1,6 @@ """ Ported to Python 3. """ -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: diff --git a/src/allmydata/scripts/admin.py b/src/allmydata/scripts/admin.py index 3acd52267..d1bd59600 100644 --- a/src/allmydata/scripts/admin.py +++ b/src/allmydata/scripts/admin.py @@ -1,10 +1,6 @@ """ Ported to Python 3. """ -from __future__ import unicode_literals -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function from future.utils import PY2 if PY2: diff --git a/src/allmydata/scripts/backupdb.py b/src/allmydata/scripts/backupdb.py index c7827e56e..21db88ee2 100644 --- a/src/allmydata/scripts/backupdb.py +++ b/src/allmydata/scripts/backupdb.py @@ -1,10 +1,6 @@ """ Ported to Python 3. """ -from __future__ import unicode_literals -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function from future.utils import PY2 if PY2: diff --git a/src/allmydata/scripts/default_nodedir.py b/src/allmydata/scripts/default_nodedir.py index 00924b8f9..89d13cd1b 100644 --- a/src/allmydata/scripts/default_nodedir.py +++ b/src/allmydata/scripts/default_nodedir.py @@ -2,10 +2,6 @@ Ported to Python 3. """ -from __future__ import unicode_literals -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function from future.utils import PY2 if PY2: diff --git a/src/allmydata/scripts/slow_operation.py b/src/allmydata/scripts/slow_operation.py index 3c23fb533..092e85823 100644 --- a/src/allmydata/scripts/slow_operation.py +++ b/src/allmydata/scripts/slow_operation.py @@ -1,10 +1,6 @@ """ Ported to Python 3. """ -from __future__ import unicode_literals -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function from future.utils import PY2, PY3 if PY2: diff --git a/src/allmydata/scripts/tahoe_add_alias.py b/src/allmydata/scripts/tahoe_add_alias.py index 8476aeb28..e29d974f4 100644 --- a/src/allmydata/scripts/tahoe_add_alias.py +++ b/src/allmydata/scripts/tahoe_add_alias.py @@ -1,10 +1,6 @@ """ Ported to Python 3. """ -from __future__ import unicode_literals -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function from future.utils import PY2 if PY2: diff --git a/src/allmydata/scripts/tahoe_backup.py b/src/allmydata/scripts/tahoe_backup.py index b574f16e8..058febb8c 100644 --- a/src/allmydata/scripts/tahoe_backup.py +++ b/src/allmydata/scripts/tahoe_backup.py @@ -1,10 +1,6 @@ """ Ported to Python 3. """ -from __future__ import unicode_literals -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function from future.utils import PY2 if PY2: diff --git a/src/allmydata/scripts/tahoe_check.py b/src/allmydata/scripts/tahoe_check.py index 6bafe3d1a..d88d3689e 100644 --- a/src/allmydata/scripts/tahoe_check.py +++ b/src/allmydata/scripts/tahoe_check.py @@ -1,10 +1,6 @@ """ Ported to Python 3. """ -from __future__ import unicode_literals -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function from future.utils import PY2 if PY2: diff --git a/src/allmydata/scripts/tahoe_cp.py b/src/allmydata/scripts/tahoe_cp.py index aae03291f..9ccbf2a05 100644 --- a/src/allmydata/scripts/tahoe_cp.py +++ b/src/allmydata/scripts/tahoe_cp.py @@ -1,10 +1,6 @@ """ Ported to Python 3. """ -from __future__ import unicode_literals -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function from future.utils import PY2 if PY2: diff --git a/src/allmydata/scripts/tahoe_get.py b/src/allmydata/scripts/tahoe_get.py index 39f1686ce..cf0dd8afa 100644 --- a/src/allmydata/scripts/tahoe_get.py +++ b/src/allmydata/scripts/tahoe_get.py @@ -1,10 +1,6 @@ """ Ported to Python 3. """ -from __future__ import unicode_literals -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function from future.utils import PY2, PY3 if PY2: diff --git a/src/allmydata/scripts/tahoe_ls.py b/src/allmydata/scripts/tahoe_ls.py index 5a7136d77..b20dec723 100644 --- a/src/allmydata/scripts/tahoe_ls.py +++ b/src/allmydata/scripts/tahoe_ls.py @@ -1,10 +1,6 @@ """ Ported to Python 3. """ -from __future__ import unicode_literals -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function from future.utils import PY2 if PY2: diff --git a/src/allmydata/scripts/tahoe_manifest.py b/src/allmydata/scripts/tahoe_manifest.py index b55075eef..e1ee95ef6 100644 --- a/src/allmydata/scripts/tahoe_manifest.py +++ b/src/allmydata/scripts/tahoe_manifest.py @@ -1,10 +1,6 @@ """ Ported to Python 3. """ -from __future__ import unicode_literals -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function from future.utils import PY2, PY3 if PY2: diff --git a/src/allmydata/scripts/tahoe_mkdir.py b/src/allmydata/scripts/tahoe_mkdir.py index 85fe12554..2bc35c391 100644 --- a/src/allmydata/scripts/tahoe_mkdir.py +++ b/src/allmydata/scripts/tahoe_mkdir.py @@ -1,10 +1,6 @@ """ Ported to Python 3. """ -from __future__ import unicode_literals -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function from future.utils import PY2 if PY2: diff --git a/src/allmydata/scripts/tahoe_mv.py b/src/allmydata/scripts/tahoe_mv.py index d921047a8..bd1e4f810 100644 --- a/src/allmydata/scripts/tahoe_mv.py +++ b/src/allmydata/scripts/tahoe_mv.py @@ -1,10 +1,6 @@ """ Ported to Python 3. """ -from __future__ import unicode_literals -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function from future.utils import PY2 if PY2: diff --git a/src/allmydata/scripts/tahoe_run.py b/src/allmydata/scripts/tahoe_run.py index eba5ae329..345f85815 100644 --- a/src/allmydata/scripts/tahoe_run.py +++ b/src/allmydata/scripts/tahoe_run.py @@ -1,10 +1,6 @@ """ Ported to Python 3. """ -from __future__ import unicode_literals -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function from future.utils import PY2 if PY2: diff --git a/src/allmydata/scripts/tahoe_status.py b/src/allmydata/scripts/tahoe_status.py index 250bfdea3..5c8c6aee0 100644 --- a/src/allmydata/scripts/tahoe_status.py +++ b/src/allmydata/scripts/tahoe_status.py @@ -1,10 +1,6 @@ """ Ported to Python 3. """ -from __future__ import unicode_literals -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function from future.utils import PY2 if PY2: diff --git a/src/allmydata/scripts/tahoe_unlink.py b/src/allmydata/scripts/tahoe_unlink.py index 5bdebb960..29da80811 100644 --- a/src/allmydata/scripts/tahoe_unlink.py +++ b/src/allmydata/scripts/tahoe_unlink.py @@ -1,10 +1,6 @@ """ Ported to Python 3. """ -from __future__ import unicode_literals -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function from future.utils import PY2 if PY2: diff --git a/src/allmydata/scripts/tahoe_webopen.py b/src/allmydata/scripts/tahoe_webopen.py index dbec31e87..2b16f09e1 100644 --- a/src/allmydata/scripts/tahoe_webopen.py +++ b/src/allmydata/scripts/tahoe_webopen.py @@ -1,10 +1,6 @@ """ Ported to Python 3. """ -from __future__ import unicode_literals -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function from future.utils import PY2 if PY2: diff --git a/src/allmydata/storage/common.py b/src/allmydata/storage/common.py index f6d986f85..e9f5e4e5d 100644 --- a/src/allmydata/storage/common.py +++ b/src/allmydata/storage/common.py @@ -1,10 +1,6 @@ """ Ported to Python 3. """ -from __future__ import unicode_literals -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function from future.utils import PY2, PY3 if PY2: diff --git a/src/allmydata/storage/crawler.py b/src/allmydata/storage/crawler.py index 7516bc4e9..8a7304808 100644 --- a/src/allmydata/storage/crawler.py +++ b/src/allmydata/storage/crawler.py @@ -4,10 +4,6 @@ Crawl the storage server shares. Ported to Python 3. """ -from __future__ import unicode_literals -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function from future.utils import PY2, PY3 if PY2: diff --git a/src/allmydata/storage/expirer.py b/src/allmydata/storage/expirer.py index 55ab51843..bcff8aeeb 100644 --- a/src/allmydata/storage/expirer.py +++ b/src/allmydata/storage/expirer.py @@ -1,7 +1,3 @@ -from __future__ import division -from __future__ import absolute_import -from __future__ import print_function -from __future__ import unicode_literals from future.utils import PY2 if PY2: diff --git a/src/allmydata/storage/immutable.py b/src/allmydata/storage/immutable.py index 0893513ae..fc696ff60 100644 --- a/src/allmydata/storage/immutable.py +++ b/src/allmydata/storage/immutable.py @@ -2,10 +2,6 @@ Ported to Python 3. """ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals from future.utils import PY2, bytes_to_native_str if PY2: diff --git a/src/allmydata/storage/immutable_schema.py b/src/allmydata/storage/immutable_schema.py index 40663b935..beb184700 100644 --- a/src/allmydata/storage/immutable_schema.py +++ b/src/allmydata/storage/immutable_schema.py @@ -2,10 +2,6 @@ Ported to Python 3. """ -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: diff --git a/src/allmydata/storage/lease.py b/src/allmydata/storage/lease.py index c0d11abfd..ad21ce598 100644 --- a/src/allmydata/storage/lease.py +++ b/src/allmydata/storage/lease.py @@ -2,10 +2,6 @@ Ported to Python 3. """ -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: diff --git a/src/allmydata/storage/mutable.py b/src/allmydata/storage/mutable.py index 51c3a3c8b..cb9116a21 100644 --- a/src/allmydata/storage/mutable.py +++ b/src/allmydata/storage/mutable.py @@ -2,10 +2,6 @@ Ported to Python 3. """ -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: diff --git a/src/allmydata/storage/mutable_schema.py b/src/allmydata/storage/mutable_schema.py index 4be0d2137..b8530e0aa 100644 --- a/src/allmydata/storage/mutable_schema.py +++ b/src/allmydata/storage/mutable_schema.py @@ -2,10 +2,6 @@ Ported to Python 3. """ -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: diff --git a/src/allmydata/storage/shares.py b/src/allmydata/storage/shares.py index 59e7b1539..5fe2b106c 100644 --- a/src/allmydata/storage/shares.py +++ b/src/allmydata/storage/shares.py @@ -2,10 +2,6 @@ Ported to Python 3. """ -from __future__ import unicode_literals -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function from future.utils import PY2 if PY2: diff --git a/src/allmydata/test/__init__.py b/src/allmydata/test/__init__.py index 893aa15ce..14ec9b054 100644 --- a/src/allmydata/test/__init__.py +++ b/src/allmydata/test/__init__.py @@ -15,10 +15,6 @@ some side-effects which make things better when the test suite runs. Ported to Python 3. """ -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: diff --git a/src/allmydata/test/cli/common.py b/src/allmydata/test/cli/common.py index ed066c6b6..45cafbec6 100644 --- a/src/allmydata/test/cli/common.py +++ b/src/allmydata/test/cli/common.py @@ -1,10 +1,6 @@ """ Ported to Python 3. """ -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: diff --git a/src/allmydata/test/cli/test_admin.py b/src/allmydata/test/cli/test_admin.py index 0570467a5..d1e9263d0 100644 --- a/src/allmydata/test/cli/test_admin.py +++ b/src/allmydata/test/cli/test_admin.py @@ -1,10 +1,6 @@ """ Ported to Python 3. """ -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: diff --git a/src/allmydata/test/cli/test_alias.py b/src/allmydata/test/cli/test_alias.py index a3ee595b8..025a7ae9d 100644 --- a/src/allmydata/test/cli/test_alias.py +++ b/src/allmydata/test/cli/test_alias.py @@ -1,10 +1,6 @@ """ Ported to Python 3. """ -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: diff --git a/src/allmydata/test/cli/test_backup.py b/src/allmydata/test/cli/test_backup.py index df598b811..804817132 100644 --- a/src/allmydata/test/cli/test_backup.py +++ b/src/allmydata/test/cli/test_backup.py @@ -1,10 +1,6 @@ """ Ported to Python 3. """ -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: diff --git a/src/allmydata/test/cli/test_backupdb.py b/src/allmydata/test/cli/test_backupdb.py index 665382dc8..ca18a4a74 100644 --- a/src/allmydata/test/cli/test_backupdb.py +++ b/src/allmydata/test/cli/test_backupdb.py @@ -1,10 +1,6 @@ """ Ported to Python 3. """ -from __future__ import print_function -from __future__ import absolute_import -from __future__ import division -from __future__ import unicode_literals from future.utils import PY2 if PY2: diff --git a/src/allmydata/test/cli/test_check.py b/src/allmydata/test/cli/test_check.py index d539f3ebe..24fd0d8e8 100644 --- a/src/allmydata/test/cli/test_check.py +++ b/src/allmydata/test/cli/test_check.py @@ -1,7 +1,3 @@ -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: diff --git a/src/allmydata/test/cli/test_cli.py b/src/allmydata/test/cli/test_cli.py index 72eb011d0..d7fde2742 100644 --- a/src/allmydata/test/cli/test_cli.py +++ b/src/allmydata/test/cli/test_cli.py @@ -1,10 +1,6 @@ """ Ported to Python 3. """ -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: diff --git a/src/allmydata/test/cli/test_cp.py b/src/allmydata/test/cli/test_cp.py index fff50f331..5e8e411ad 100644 --- a/src/allmydata/test/cli/test_cp.py +++ b/src/allmydata/test/cli/test_cp.py @@ -1,10 +1,6 @@ """ Ported to Python 3. """ -from __future__ import print_function -from __future__ import absolute_import -from __future__ import division -from __future__ import unicode_literals from future.utils import PY2 if PY2: diff --git a/src/allmydata/test/cli/test_create_alias.py b/src/allmydata/test/cli/test_create_alias.py index 176bf7576..cb8526087 100644 --- a/src/allmydata/test/cli/test_create_alias.py +++ b/src/allmydata/test/cli/test_create_alias.py @@ -1,10 +1,6 @@ """ Ported to Python 3. """ -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: diff --git a/src/allmydata/test/cli/test_list.py b/src/allmydata/test/cli/test_list.py index 1206579f1..141908987 100644 --- a/src/allmydata/test/cli/test_list.py +++ b/src/allmydata/test/cli/test_list.py @@ -1,10 +1,6 @@ """ Ported to Python 3. """ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals from future.utils import PY2, PY3 if PY2: diff --git a/src/allmydata/test/cli/test_mv.py b/src/allmydata/test/cli/test_mv.py index 0bb9ba369..cb998025d 100644 --- a/src/allmydata/test/cli/test_mv.py +++ b/src/allmydata/test/cli/test_mv.py @@ -1,10 +1,6 @@ """ Ported to Python 3. """ -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: diff --git a/src/allmydata/test/cli/test_status.py b/src/allmydata/test/cli/test_status.py index a015391e2..e8d2ca3c8 100644 --- a/src/allmydata/test/cli/test_status.py +++ b/src/allmydata/test/cli/test_status.py @@ -1,10 +1,6 @@ """ Ported to Python 3. """ -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: diff --git a/src/allmydata/test/cli_node_api.py b/src/allmydata/test/cli_node_api.py index c324d5565..e7d5e6600 100644 --- a/src/allmydata/test/cli_node_api.py +++ b/src/allmydata/test/cli_node_api.py @@ -1,10 +1,6 @@ """ Ported to Python 3. """ -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: diff --git a/src/allmydata/test/common_util.py b/src/allmydata/test/common_util.py index 2bf88ce20..12e5cec72 100644 --- a/src/allmydata/test/common_util.py +++ b/src/allmydata/test/common_util.py @@ -1,10 +1,6 @@ """ Ported to Python 3. """ -from __future__ import print_function -from __future__ import absolute_import -from __future__ import division -from __future__ import unicode_literals from future.utils import PY2, PY3, bchr, binary_type from future.builtins import str as future_str diff --git a/src/allmydata/test/common_web.py b/src/allmydata/test/common_web.py index bd55a9fe9..e43474da1 100644 --- a/src/allmydata/test/common_web.py +++ b/src/allmydata/test/common_web.py @@ -1,10 +1,6 @@ """ Ported to Python 3. """ -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: diff --git a/src/allmydata/test/matchers.py b/src/allmydata/test/matchers.py index cc8bf47be..20edd88c2 100644 --- a/src/allmydata/test/matchers.py +++ b/src/allmydata/test/matchers.py @@ -3,10 +3,6 @@ Testtools-style matchers useful to the Tahoe-LAFS test suite. Ported to Python 3. """ -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: diff --git a/src/allmydata/test/mutable/test_checker.py b/src/allmydata/test/mutable/test_checker.py index 6d9145d68..8eaa6c845 100644 --- a/src/allmydata/test/mutable/test_checker.py +++ b/src/allmydata/test/mutable/test_checker.py @@ -1,10 +1,6 @@ """ Ported to Python 3. """ -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: diff --git a/src/allmydata/test/mutable/test_datahandle.py b/src/allmydata/test/mutable/test_datahandle.py index 7aabcd8e1..79536e7d1 100644 --- a/src/allmydata/test/mutable/test_datahandle.py +++ b/src/allmydata/test/mutable/test_datahandle.py @@ -1,10 +1,6 @@ """ Ported to Python 3. """ -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: diff --git a/src/allmydata/test/mutable/test_different_encoding.py b/src/allmydata/test/mutable/test_different_encoding.py index f1796d373..6bfc7e89a 100644 --- a/src/allmydata/test/mutable/test_different_encoding.py +++ b/src/allmydata/test/mutable/test_different_encoding.py @@ -1,10 +1,6 @@ """ Ported to Python 3. """ -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: diff --git a/src/allmydata/test/mutable/test_exceptions.py b/src/allmydata/test/mutable/test_exceptions.py index 23674d036..fa1c1a884 100644 --- a/src/allmydata/test/mutable/test_exceptions.py +++ b/src/allmydata/test/mutable/test_exceptions.py @@ -2,10 +2,6 @@ Ported to Python 3. """ -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: diff --git a/src/allmydata/test/mutable/test_filehandle.py b/src/allmydata/test/mutable/test_filehandle.py index 795f60654..1e6c61c68 100644 --- a/src/allmydata/test/mutable/test_filehandle.py +++ b/src/allmydata/test/mutable/test_filehandle.py @@ -1,10 +1,6 @@ """ Ported to Python 3. """ -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: diff --git a/src/allmydata/test/mutable/test_filenode.py b/src/allmydata/test/mutable/test_filenode.py index 6c00e4420..ca76be1b0 100644 --- a/src/allmydata/test/mutable/test_filenode.py +++ b/src/allmydata/test/mutable/test_filenode.py @@ -1,10 +1,6 @@ """ Ported to Python 3. """ -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: diff --git a/src/allmydata/test/mutable/test_interoperability.py b/src/allmydata/test/mutable/test_interoperability.py index 496da1d2a..745baca97 100644 --- a/src/allmydata/test/mutable/test_interoperability.py +++ b/src/allmydata/test/mutable/test_interoperability.py @@ -1,10 +1,6 @@ """ Ported to Python 3. """ -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: diff --git a/src/allmydata/test/mutable/test_multiple_encodings.py b/src/allmydata/test/mutable/test_multiple_encodings.py index 2291b60d8..8ccfd387e 100644 --- a/src/allmydata/test/mutable/test_multiple_encodings.py +++ b/src/allmydata/test/mutable/test_multiple_encodings.py @@ -1,10 +1,6 @@ """ Ported to Python 3. """ -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: diff --git a/src/allmydata/test/mutable/test_multiple_versions.py b/src/allmydata/test/mutable/test_multiple_versions.py index c9b7e71df..c9c1f15aa 100644 --- a/src/allmydata/test/mutable/test_multiple_versions.py +++ b/src/allmydata/test/mutable/test_multiple_versions.py @@ -1,10 +1,6 @@ """ Ported to Python 3. """ -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: diff --git a/src/allmydata/test/mutable/test_problems.py b/src/allmydata/test/mutable/test_problems.py index d3a779905..6f22c02c2 100644 --- a/src/allmydata/test/mutable/test_problems.py +++ b/src/allmydata/test/mutable/test_problems.py @@ -1,10 +1,6 @@ """ Ported to Python 3. """ -from __future__ import print_function -from __future__ import absolute_import -from __future__ import division -from __future__ import unicode_literals from future.utils import PY2 if PY2: diff --git a/src/allmydata/test/mutable/test_repair.py b/src/allmydata/test/mutable/test_repair.py index deddb8d92..f4ae53e13 100644 --- a/src/allmydata/test/mutable/test_repair.py +++ b/src/allmydata/test/mutable/test_repair.py @@ -1,10 +1,6 @@ """ Ported to Python 3. """ -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: diff --git a/src/allmydata/test/mutable/test_roundtrip.py b/src/allmydata/test/mutable/test_roundtrip.py index 96ecdf640..eddd7f3df 100644 --- a/src/allmydata/test/mutable/test_roundtrip.py +++ b/src/allmydata/test/mutable/test_roundtrip.py @@ -1,10 +1,6 @@ """ Ported to Python 3. """ -from __future__ import print_function -from __future__ import absolute_import -from __future__ import division -from __future__ import unicode_literals from future.utils import PY2 if PY2: diff --git a/src/allmydata/test/mutable/test_servermap.py b/src/allmydata/test/mutable/test_servermap.py index 505d31e73..b3a247015 100644 --- a/src/allmydata/test/mutable/test_servermap.py +++ b/src/allmydata/test/mutable/test_servermap.py @@ -2,10 +2,6 @@ Ported to Python 3. """ -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: diff --git a/src/allmydata/test/mutable/test_update.py b/src/allmydata/test/mutable/test_update.py index 1c91590bd..02fca24b2 100644 --- a/src/allmydata/test/mutable/test_update.py +++ b/src/allmydata/test/mutable/test_update.py @@ -1,10 +1,6 @@ """ Ported to Python 3. """ -from __future__ import print_function -from __future__ import division -from __future__ import absolute_import -from __future__ import unicode_literals from future.utils import PY2 if PY2: diff --git a/src/allmydata/test/mutable/util.py b/src/allmydata/test/mutable/util.py index bed350652..336b8bfd7 100644 --- a/src/allmydata/test/mutable/util.py +++ b/src/allmydata/test/mutable/util.py @@ -1,10 +1,6 @@ """ Ported to Python 3. """ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals from future.utils import PY2, bchr if PY2: diff --git a/src/allmydata/test/storage_plugin.py b/src/allmydata/test/storage_plugin.py index d3f1ec7c9..cb18f4dda 100644 --- a/src/allmydata/test/storage_plugin.py +++ b/src/allmydata/test/storage_plugin.py @@ -4,10 +4,6 @@ functionality. Ported to Python 3. """ -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: diff --git a/src/allmydata/test/strategies.py b/src/allmydata/test/strategies.py index 35b9766b0..92290203e 100644 --- a/src/allmydata/test/strategies.py +++ b/src/allmydata/test/strategies.py @@ -3,10 +3,6 @@ Hypothesis strategies use for testing Tahoe-LAFS. Ported to Python 3. """ -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: diff --git a/src/allmydata/test/test_abbreviate.py b/src/allmydata/test/test_abbreviate.py index 3ef1e96a6..cefa7f23f 100644 --- a/src/allmydata/test/test_abbreviate.py +++ b/src/allmydata/test/test_abbreviate.py @@ -3,10 +3,6 @@ Tests for allmydata.util.abbreviate. Ported to Python 3. """ -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: diff --git a/src/allmydata/test/test_base32.py b/src/allmydata/test/test_base32.py index 0b9a018b9..236560599 100644 --- a/src/allmydata/test/test_base32.py +++ b/src/allmydata/test/test_base32.py @@ -3,10 +3,6 @@ Tests for allmydata.util.base32. Ported to Python 3. """ -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: diff --git a/src/allmydata/test/test_base62.py b/src/allmydata/test/test_base62.py index 8bbb6dfeb..258ca62ec 100644 --- a/src/allmydata/test/test_base62.py +++ b/src/allmydata/test/test_base62.py @@ -4,10 +4,6 @@ Tests for allmydata.util.base62. Ported to Python 3. """ -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: diff --git a/src/allmydata/test/test_checker.py b/src/allmydata/test/test_checker.py index 3d64d4976..a33fc23b5 100644 --- a/src/allmydata/test/test_checker.py +++ b/src/allmydata/test/test_checker.py @@ -2,10 +2,6 @@ Ported to Python 3. """ -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: diff --git a/src/allmydata/test/test_codec.py b/src/allmydata/test/test_codec.py index ee64e2bf2..efb575cd7 100644 --- a/src/allmydata/test/test_codec.py +++ b/src/allmydata/test/test_codec.py @@ -3,10 +3,6 @@ Tests for allmydata.codec. Ported to Python 3. """ -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: diff --git a/src/allmydata/test/test_common_util.py b/src/allmydata/test/test_common_util.py index c141adc8d..b1c698208 100644 --- a/src/allmydata/test/test_common_util.py +++ b/src/allmydata/test/test_common_util.py @@ -1,10 +1,6 @@ """ This module has been ported to Python 3. """ -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: diff --git a/src/allmydata/test/test_configutil.py b/src/allmydata/test/test_configutil.py index 1b8fb5029..d1931479f 100644 --- a/src/allmydata/test/test_configutil.py +++ b/src/allmydata/test/test_configutil.py @@ -3,10 +3,6 @@ Tests for allmydata.util.configutil. Ported to Python 3. """ -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: diff --git a/src/allmydata/test/test_connections.py b/src/allmydata/test/test_connections.py index 5816afdab..3cf8ed937 100644 --- a/src/allmydata/test/test_connections.py +++ b/src/allmydata/test/test_connections.py @@ -1,10 +1,6 @@ """ Ported to Python 3. """ -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: diff --git a/src/allmydata/test/test_consumer.py b/src/allmydata/test/test_consumer.py index ee1908ba7..9465b42cd 100644 --- a/src/allmydata/test/test_consumer.py +++ b/src/allmydata/test/test_consumer.py @@ -4,10 +4,6 @@ Tests for allmydata.util.consumer. Ported to Python 3. """ -from __future__ import unicode_literals -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function from future.utils import PY2 if PY2: diff --git a/src/allmydata/test/test_crawler.py b/src/allmydata/test/test_crawler.py index 80d732986..02181dd55 100644 --- a/src/allmydata/test/test_crawler.py +++ b/src/allmydata/test/test_crawler.py @@ -4,10 +4,6 @@ Tests for allmydata.storage.crawler. Ported to Python 3. """ -from __future__ import print_function -from __future__ import division -from __future__ import absolute_import -from __future__ import unicode_literals from future.utils import PY2, PY3 if PY2: diff --git a/src/allmydata/test/test_crypto.py b/src/allmydata/test/test_crypto.py index b7c84b447..2114b053b 100644 --- a/src/allmydata/test/test_crypto.py +++ b/src/allmydata/test/test_crypto.py @@ -1,7 +1,3 @@ -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: diff --git a/src/allmydata/test/test_deepcheck.py b/src/allmydata/test/test_deepcheck.py index 652e51ea5..8af75bcd0 100644 --- a/src/allmydata/test/test_deepcheck.py +++ b/src/allmydata/test/test_deepcheck.py @@ -1,10 +1,6 @@ """ Ported to Python 3. """ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals # Python 2 compatibility # Can't use `builtins.str` because something deep in Twisted callbacks ends up repr'ing diff --git a/src/allmydata/test/test_dirnode.py b/src/allmydata/test/test_dirnode.py index 2319e3ce1..2349f3c4e 100644 --- a/src/allmydata/test/test_dirnode.py +++ b/src/allmydata/test/test_dirnode.py @@ -2,10 +2,6 @@ Ported to Python 3. """ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals from past.builtins import long diff --git a/src/allmydata/test/test_encode.py b/src/allmydata/test/test_encode.py index 028a988cb..33c946010 100644 --- a/src/allmydata/test/test_encode.py +++ b/src/allmydata/test/test_encode.py @@ -1,10 +1,6 @@ """ Ported to Python 3. """ -from __future__ import division -from __future__ import absolute_import -from __future__ import print_function -from __future__ import unicode_literals from future.utils import PY2 if PY2: diff --git a/src/allmydata/test/test_encodingutil.py b/src/allmydata/test/test_encodingutil.py index 062c64ba1..b218b0bd9 100644 --- a/src/allmydata/test/test_encodingutil.py +++ b/src/allmydata/test/test_encodingutil.py @@ -1,7 +1,3 @@ -from __future__ import print_function -from __future__ import absolute_import -from __future__ import division -from __future__ import unicode_literals from future.utils import PY2, PY3 if PY2: diff --git a/src/allmydata/test/test_filenode.py b/src/allmydata/test/test_filenode.py index a8f0e2431..2bf1edd6c 100644 --- a/src/allmydata/test/test_filenode.py +++ b/src/allmydata/test/test_filenode.py @@ -1,10 +1,6 @@ """ Ported to Python 3. """ -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: diff --git a/src/allmydata/test/test_happiness.py b/src/allmydata/test/test_happiness.py index 9ff36ef26..8f21b1363 100644 --- a/src/allmydata/test/test_happiness.py +++ b/src/allmydata/test/test_happiness.py @@ -6,10 +6,6 @@ allmydata.util.happinessutil. Ported to Python 3. """ -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: diff --git a/src/allmydata/test/test_hashutil.py b/src/allmydata/test/test_hashutil.py index 1efa2d9db..d64fb8abc 100644 --- a/src/allmydata/test/test_hashutil.py +++ b/src/allmydata/test/test_hashutil.py @@ -3,10 +3,6 @@ Tests for allmydata.util.hashutil. Ported to Python 3. """ -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: diff --git a/src/allmydata/test/test_humanreadable.py b/src/allmydata/test/test_humanreadable.py index 94de8f6be..b74277448 100644 --- a/src/allmydata/test/test_humanreadable.py +++ b/src/allmydata/test/test_humanreadable.py @@ -4,10 +4,6 @@ Tests for allmydata.util.humanreadable. This module has been ported to Python 3. """ -from __future__ import unicode_literals -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function from future.utils import PY2 if PY2: diff --git a/src/allmydata/test/test_hung_server.py b/src/allmydata/test/test_hung_server.py index 162b1d79c..24e2810e0 100644 --- a/src/allmydata/test/test_hung_server.py +++ b/src/allmydata/test/test_hung_server.py @@ -3,10 +3,6 @@ """ Ported to Python 3. """ -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: diff --git a/src/allmydata/test/test_i2p_provider.py b/src/allmydata/test/test_i2p_provider.py index 072b17647..8628aeed6 100644 --- a/src/allmydata/test/test_i2p_provider.py +++ b/src/allmydata/test/test_i2p_provider.py @@ -1,10 +1,6 @@ """ Ported to Python 3. """ -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: diff --git a/src/allmydata/test/test_immutable.py b/src/allmydata/test/test_immutable.py index 12f2012e0..303485831 100644 --- a/src/allmydata/test/test_immutable.py +++ b/src/allmydata/test/test_immutable.py @@ -1,10 +1,6 @@ """ This module has been ported to Python 3. """ -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: diff --git a/src/allmydata/test/test_introducer.py b/src/allmydata/test/test_introducer.py index 0475d3f6c..2fd6ff69b 100644 --- a/src/allmydata/test/test_introducer.py +++ b/src/allmydata/test/test_introducer.py @@ -1,10 +1,6 @@ """ Ported to Python 3. """ -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: diff --git a/src/allmydata/test/test_json_metadata.py b/src/allmydata/test/test_json_metadata.py index a0cb9c142..822d37925 100644 --- a/src/allmydata/test/test_json_metadata.py +++ b/src/allmydata/test/test_json_metadata.py @@ -1,10 +1,6 @@ """ Ported to Python 3. """ -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: diff --git a/src/allmydata/test/test_log.py b/src/allmydata/test/test_log.py index bf079aaeb..c3472cad8 100644 --- a/src/allmydata/test/test_log.py +++ b/src/allmydata/test/test_log.py @@ -4,10 +4,6 @@ Tests for allmydata.util.log. Ported to Python 3. """ -from __future__ import unicode_literals -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function from future.utils import PY2, native_str if PY2: diff --git a/src/allmydata/test/test_monitor.py b/src/allmydata/test/test_monitor.py index 7010da73a..bede3e001 100644 --- a/src/allmydata/test/test_monitor.py +++ b/src/allmydata/test/test_monitor.py @@ -2,10 +2,6 @@ Tests for allmydata.monitor. """ -from __future__ import unicode_literals -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function from future.utils import PY2 if PY2: diff --git a/src/allmydata/test/test_multi_introducers.py b/src/allmydata/test/test_multi_introducers.py index 2b0879530..7f42177ab 100644 --- a/src/allmydata/test/test_multi_introducers.py +++ b/src/allmydata/test/test_multi_introducers.py @@ -1,10 +1,6 @@ """ Ported to Python 3. """ -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: diff --git a/src/allmydata/test/test_netstring.py b/src/allmydata/test/test_netstring.py index d5ff379cd..54cc16df8 100644 --- a/src/allmydata/test/test_netstring.py +++ b/src/allmydata/test/test_netstring.py @@ -3,10 +3,6 @@ Tests for allmydata.util.netstring. Ported to Python 3. """ -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: diff --git a/src/allmydata/test/test_no_network.py b/src/allmydata/test/test_no_network.py index b1aa1350a..2d6bdb896 100644 --- a/src/allmydata/test/test_no_network.py +++ b/src/allmydata/test/test_no_network.py @@ -3,10 +3,6 @@ Test the NoNetworkGrid test harness. Ported to Python 3. """ -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: diff --git a/src/allmydata/test/test_observer.py b/src/allmydata/test/test_observer.py index 134876be3..ddc58b074 100644 --- a/src/allmydata/test/test_observer.py +++ b/src/allmydata/test/test_observer.py @@ -4,10 +4,6 @@ Tests for allmydata.util.observer. Ported to Python 3. """ -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: diff --git a/src/allmydata/test/test_openmetrics.py b/src/allmydata/test/test_openmetrics.py index 66cbc7dec..2199bcc5f 100644 --- a/src/allmydata/test/test_openmetrics.py +++ b/src/allmydata/test/test_openmetrics.py @@ -4,10 +4,6 @@ Tests for ``/statistics?t=openmetrics``. Ported to Python 3. """ -from __future__ import print_function -from __future__ import absolute_import -from __future__ import division -from __future__ import unicode_literals from future.utils import PY2 diff --git a/src/allmydata/test/test_python2_regressions.py b/src/allmydata/test/test_python2_regressions.py index c641d2dba..9a12f0374 100644 --- a/src/allmydata/test/test_python2_regressions.py +++ b/src/allmydata/test/test_python2_regressions.py @@ -2,10 +2,6 @@ Tests to check for Python2 regressions """ -from __future__ import unicode_literals -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function from future.utils import PY2 if PY2: diff --git a/src/allmydata/test/test_repairer.py b/src/allmydata/test/test_repairer.py index 8545b1cf4..280825775 100644 --- a/src/allmydata/test/test_repairer.py +++ b/src/allmydata/test/test_repairer.py @@ -2,10 +2,6 @@ """ Ported to Python 3. """ -from __future__ import print_function -from __future__ import absolute_import -from __future__ import division -from __future__ import unicode_literals from future.utils import PY2 if PY2: diff --git a/src/allmydata/test/test_runner.py b/src/allmydata/test/test_runner.py index a84fa28f8..b784b2c61 100644 --- a/src/allmydata/test/test_runner.py +++ b/src/allmydata/test/test_runner.py @@ -2,13 +2,6 @@ Ported to Python 3 """ -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: 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 diff --git a/src/allmydata/test/test_sftp.py b/src/allmydata/test/test_sftp.py index 2214e4e5b..d1902b9ee 100644 --- a/src/allmydata/test/test_sftp.py +++ b/src/allmydata/test/test_sftp.py @@ -1,10 +1,6 @@ """ Ported to Python 3. """ -from __future__ import print_function -from __future__ import absolute_import -from __future__ import division -from __future__ import unicode_literals from future.utils import PY2 if PY2: diff --git a/src/allmydata/test/test_spans.py b/src/allmydata/test/test_spans.py index 281f916c4..e1ac9a229 100644 --- a/src/allmydata/test/test_spans.py +++ b/src/allmydata/test/test_spans.py @@ -2,10 +2,6 @@ Tests for allmydata.util.spans. """ -from __future__ import print_function -from __future__ import absolute_import -from __future__ import division -from __future__ import unicode_literals from future.utils import PY2 if PY2: diff --git a/src/allmydata/test/test_statistics.py b/src/allmydata/test/test_statistics.py index 476f0a084..ce91e4efb 100644 --- a/src/allmydata/test/test_statistics.py +++ b/src/allmydata/test/test_statistics.py @@ -3,10 +3,6 @@ Tests for allmydata.util.statistics. Ported to Python 3. """ -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: diff --git a/src/allmydata/test/test_stats.py b/src/allmydata/test/test_stats.py index 6fe690f1f..8f02640e0 100644 --- a/src/allmydata/test/test_stats.py +++ b/src/allmydata/test/test_stats.py @@ -1,10 +1,6 @@ """ Ported to Python 3. """ -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: diff --git a/src/allmydata/test/test_storage_web.py b/src/allmydata/test/test_storage_web.py index b47c93849..10249c83a 100644 --- a/src/allmydata/test/test_storage_web.py +++ b/src/allmydata/test/test_storage_web.py @@ -4,10 +4,6 @@ Tests for twisted.storage that uses Web APIs. Partially ported to Python 3. """ -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: diff --git a/src/allmydata/test/test_time_format.py b/src/allmydata/test/test_time_format.py index f83a6a53c..2f10a3ea9 100644 --- a/src/allmydata/test/test_time_format.py +++ b/src/allmydata/test/test_time_format.py @@ -1,10 +1,6 @@ """ Tests for allmydata.util.time_format. """ -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: diff --git a/src/allmydata/test/test_upload.py b/src/allmydata/test/test_upload.py index 18192de6c..f9541e946 100644 --- a/src/allmydata/test/test_upload.py +++ b/src/allmydata/test/test_upload.py @@ -3,10 +3,6 @@ """ Ported to Python 3. """ -from __future__ import unicode_literals -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function from future.utils import PY2 if PY2: diff --git a/src/allmydata/test/test_uri.py b/src/allmydata/test/test_uri.py index 748a0f6ef..7f4908da6 100644 --- a/src/allmydata/test/test_uri.py +++ b/src/allmydata/test/test_uri.py @@ -4,10 +4,6 @@ Tests for allmydata.uri. Ported to Python 3. """ -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: diff --git a/src/allmydata/test/test_util.py b/src/allmydata/test/test_util.py index d3a36a756..0b4917381 100644 --- a/src/allmydata/test/test_util.py +++ b/src/allmydata/test/test_util.py @@ -2,10 +2,6 @@ Ported to Python3. """ -from __future__ import print_function -from __future__ import absolute_import -from __future__ import division -from __future__ import unicode_literals from future.utils import PY2 if PY2: diff --git a/src/allmydata/test/web/common.py b/src/allmydata/test/web/common.py index fbf7b015f..be7fe0af1 100644 --- a/src/allmydata/test/web/common.py +++ b/src/allmydata/test/web/common.py @@ -1,10 +1,6 @@ """ Ported to Python 3. """ -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: diff --git a/src/allmydata/test/web/matchers.py b/src/allmydata/test/web/matchers.py index f764da79d..f6d52aaad 100644 --- a/src/allmydata/test/web/matchers.py +++ b/src/allmydata/test/web/matchers.py @@ -1,10 +1,6 @@ """ Ported to Python 3. """ -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: diff --git a/src/allmydata/test/web/test_common.py b/src/allmydata/test/web/test_common.py index 84ab5cab2..6c19a5b78 100644 --- a/src/allmydata/test/web/test_common.py +++ b/src/allmydata/test/web/test_common.py @@ -3,10 +3,6 @@ Tests for ``allmydata.web.common``. Ported to Python 3. """ -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: diff --git a/src/allmydata/test/web/test_grid.py b/src/allmydata/test/web/test_grid.py index 1ebe3a90f..0a7c913c0 100644 --- a/src/allmydata/test/web/test_grid.py +++ b/src/allmydata/test/web/test_grid.py @@ -1,10 +1,6 @@ """ Ported to Python 3. """ -from __future__ import print_function -from __future__ import absolute_import -from __future__ import division -from __future__ import unicode_literals from future.utils import PY2 if PY2: diff --git a/src/allmydata/test/web/test_introducer.py b/src/allmydata/test/web/test_introducer.py index 69309d35b..d21a663f7 100644 --- a/src/allmydata/test/web/test_introducer.py +++ b/src/allmydata/test/web/test_introducer.py @@ -1,10 +1,6 @@ """ Ported to Python 3. """ -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: diff --git a/src/allmydata/test/web/test_logs.py b/src/allmydata/test/web/test_logs.py index a8b479a97..093503265 100644 --- a/src/allmydata/test/web/test_logs.py +++ b/src/allmydata/test/web/test_logs.py @@ -4,13 +4,6 @@ Tests for ``allmydata.web.logs``. Ported to Python 3. """ -from __future__ import ( - print_function, - unicode_literals, - absolute_import, - division, -) - 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 diff --git a/src/allmydata/test/web/test_private.py b/src/allmydata/test/web/test_private.py index b426b4d93..5652e8008 100644 --- a/src/allmydata/test/web/test_private.py +++ b/src/allmydata/test/web/test_private.py @@ -4,13 +4,6 @@ Tests for ``allmydata.web.private``. Ported to Python 3. """ -from __future__ import ( - print_function, - unicode_literals, - absolute_import, - division, -) - 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 diff --git a/src/allmydata/test/web/test_root.py b/src/allmydata/test/web/test_root.py index 228b8e449..e810f9a14 100644 --- a/src/allmydata/test/web/test_root.py +++ b/src/allmydata/test/web/test_root.py @@ -1,10 +1,6 @@ """ Ported to Python 3. """ -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: diff --git a/src/allmydata/test/web/test_status.py b/src/allmydata/test/web/test_status.py index 414925446..c46ac4500 100644 --- a/src/allmydata/test/web/test_status.py +++ b/src/allmydata/test/web/test_status.py @@ -3,10 +3,6 @@ Tests for ```allmydata.web.status```. Ported to Python 3. """ -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: diff --git a/src/allmydata/test/web/test_util.py b/src/allmydata/test/web/test_util.py index c536dc9f1..5afe884b0 100644 --- a/src/allmydata/test/web/test_util.py +++ b/src/allmydata/test/web/test_util.py @@ -1,10 +1,6 @@ """ Ported to Python 3. """ -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: diff --git a/src/allmydata/unknown.py b/src/allmydata/unknown.py index 060696293..bfb56496d 100644 --- a/src/allmydata/unknown.py +++ b/src/allmydata/unknown.py @@ -1,9 +1,5 @@ """Ported to Python 3. """ -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: diff --git a/src/allmydata/util/abbreviate.py b/src/allmydata/util/abbreviate.py index f895c3727..e775813bd 100644 --- a/src/allmydata/util/abbreviate.py +++ b/src/allmydata/util/abbreviate.py @@ -3,10 +3,6 @@ Convert timestamps to abbreviated English text. Ported to Python 3. """ -from __future__ import division -from __future__ import absolute_import -from __future__ import print_function -from __future__ import unicode_literals from future.utils import PY2 if PY2: diff --git a/src/allmydata/util/assertutil.py b/src/allmydata/util/assertutil.py index ed4b8599f..2088f505c 100644 --- a/src/allmydata/util/assertutil.py +++ b/src/allmydata/util/assertutil.py @@ -7,10 +7,6 @@ have tests. Ported to Python 3. """ -from __future__ import division -from __future__ import absolute_import -from __future__ import print_function -from __future__ import unicode_literals from future.utils import PY2 if PY2: diff --git a/src/allmydata/util/base62.py b/src/allmydata/util/base62.py index 964baff34..dcde36562 100644 --- a/src/allmydata/util/base62.py +++ b/src/allmydata/util/base62.py @@ -3,10 +3,6 @@ Base62 encoding. Ported to Python 3. """ -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: diff --git a/src/allmydata/util/configutil.py b/src/allmydata/util/configutil.py index 74b0c714a..749f6d7d7 100644 --- a/src/allmydata/util/configutil.py +++ b/src/allmydata/util/configutil.py @@ -5,10 +5,6 @@ Configuration is returned as Unicode strings. Ported to Python 3. """ -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: diff --git a/src/allmydata/util/consumer.py b/src/allmydata/util/consumer.py index 3de82974d..cd73119fe 100644 --- a/src/allmydata/util/consumer.py +++ b/src/allmydata/util/consumer.py @@ -4,10 +4,6 @@ a filenode's read() method. See download_to_data() for an example of its use. Ported to Python 3. """ -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: diff --git a/src/allmydata/util/dbutil.py b/src/allmydata/util/dbutil.py index 45e59cf00..ac7ddbfeb 100644 --- a/src/allmydata/util/dbutil.py +++ b/src/allmydata/util/dbutil.py @@ -6,10 +6,6 @@ Test coverage currently provided by test_backupdb.py. Ported to Python 3. """ -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: diff --git a/src/allmydata/util/encodingutil.py b/src/allmydata/util/encodingutil.py index 5e28f59fe..d13011dd2 100644 --- a/src/allmydata/util/encodingutil.py +++ b/src/allmydata/util/encodingutil.py @@ -7,10 +7,6 @@ Ported to Python 3. Once Python 2 support is dropped, most of this module will obsolete, since Unicode is the default everywhere in Python 3. """ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals from future.utils import PY2, PY3, native_str from future.builtins import str as future_str diff --git a/src/allmydata/util/fileutil.py b/src/allmydata/util/fileutil.py index e40e06180..0df3781b5 100644 --- a/src/allmydata/util/fileutil.py +++ b/src/allmydata/util/fileutil.py @@ -4,10 +4,6 @@ Ported to Python3. Futz with files like a pro. """ -from __future__ import print_function -from __future__ import absolute_import -from __future__ import division -from __future__ import unicode_literals from future.utils import PY2 if PY2: diff --git a/src/allmydata/util/gcutil.py b/src/allmydata/util/gcutil.py index 33f1f64f5..9eed8b1f4 100644 --- a/src/allmydata/util/gcutil.py +++ b/src/allmydata/util/gcutil.py @@ -10,10 +10,6 @@ Helpers for managing garbage collection. Ported to Python 3. """ -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: diff --git a/src/allmydata/util/happinessutil.py b/src/allmydata/util/happinessutil.py index 9f2617a5e..7f5d0f8a7 100644 --- a/src/allmydata/util/happinessutil.py +++ b/src/allmydata/util/happinessutil.py @@ -4,10 +4,6 @@ reporting it in messages. Ported to Python 3. """ -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: diff --git a/src/allmydata/util/hashutil.py b/src/allmydata/util/hashutil.py index 8525dd95e..579f55d88 100644 --- a/src/allmydata/util/hashutil.py +++ b/src/allmydata/util/hashutil.py @@ -3,10 +3,6 @@ Hashing utilities. Ported to Python 3. """ -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: diff --git a/src/allmydata/util/humanreadable.py b/src/allmydata/util/humanreadable.py index 60ac57083..2eaa7c79a 100644 --- a/src/allmydata/util/humanreadable.py +++ b/src/allmydata/util/humanreadable.py @@ -4,10 +4,6 @@ Utilities for turning objects into human-readable strings. This module has been ported to Python 3. """ -from __future__ import division -from __future__ import absolute_import -from __future__ import print_function -from __future__ import unicode_literals from future.utils import PY2 if PY2: diff --git a/src/allmydata/util/idlib.py b/src/allmydata/util/idlib.py index eafcbc388..c74f11599 100644 --- a/src/allmydata/util/idlib.py +++ b/src/allmydata/util/idlib.py @@ -1,10 +1,6 @@ """ Ported to Python 3. """ -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: diff --git a/src/allmydata/util/jsonbytes.py b/src/allmydata/util/jsonbytes.py index ea95bb5b8..24c8f3311 100644 --- a/src/allmydata/util/jsonbytes.py +++ b/src/allmydata/util/jsonbytes.py @@ -4,10 +4,6 @@ A JSON encoder than can serialize bytes. Ported to Python 3. """ -from __future__ import unicode_literals -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function from future.utils import PY2 if PY2: diff --git a/src/allmydata/util/log.py b/src/allmydata/util/log.py index b442d30bb..afd612d7a 100644 --- a/src/allmydata/util/log.py +++ b/src/allmydata/util/log.py @@ -3,10 +3,6 @@ Logging utilities. Ported to Python 3. """ -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: diff --git a/src/allmydata/util/mathutil.py b/src/allmydata/util/mathutil.py index 42863c30e..a6a58e834 100644 --- a/src/allmydata/util/mathutil.py +++ b/src/allmydata/util/mathutil.py @@ -6,10 +6,6 @@ Backwards compatibility for direct imports. Ported to Python 3. """ -from __future__ import division -from __future__ import absolute_import -from __future__ import print_function -from __future__ import unicode_literals from future.utils import PY2 if PY2: diff --git a/src/allmydata/util/netstring.py b/src/allmydata/util/netstring.py index 423b8665b..23d8492ab 100644 --- a/src/allmydata/util/netstring.py +++ b/src/allmydata/util/netstring.py @@ -3,10 +3,6 @@ Netstring encoding and decoding. Ported to Python 3. """ -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: diff --git a/src/allmydata/util/observer.py b/src/allmydata/util/observer.py index 4a39fe014..b753d51ad 100644 --- a/src/allmydata/util/observer.py +++ b/src/allmydata/util/observer.py @@ -4,10 +4,6 @@ Observer for Twisted code. Ported to Python 3. """ -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: diff --git a/src/allmydata/util/rrefutil.py b/src/allmydata/util/rrefutil.py index f39890ff1..1fb757f34 100644 --- a/src/allmydata/util/rrefutil.py +++ b/src/allmydata/util/rrefutil.py @@ -1,10 +1,6 @@ """ Ported to Python 3. """ -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: diff --git a/src/allmydata/util/spans.py b/src/allmydata/util/spans.py index 81e14c0fb..4ddc67704 100644 --- a/src/allmydata/util/spans.py +++ b/src/allmydata/util/spans.py @@ -1,7 +1,3 @@ -from __future__ import print_function -from __future__ import absolute_import -from __future__ import division -from __future__ import unicode_literals from future.utils import PY2 if PY2: diff --git a/src/allmydata/util/statistics.py b/src/allmydata/util/statistics.py index a517751d6..35a7216a2 100644 --- a/src/allmydata/util/statistics.py +++ b/src/allmydata/util/statistics.py @@ -11,10 +11,6 @@ Ported to Python 3. # Transitive Grace Period Public License, version 1 or later. -from __future__ import unicode_literals -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function from future.utils import PY2 if PY2: diff --git a/src/allmydata/util/time_format.py b/src/allmydata/util/time_format.py index ff267485e..af98bf1d2 100644 --- a/src/allmydata/util/time_format.py +++ b/src/allmydata/util/time_format.py @@ -4,10 +4,6 @@ Time formatting utilities. ISO-8601: http://www.cl.cam.ac.uk/~mgk25/iso-time.html """ -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: diff --git a/src/allmydata/util/yamlutil.py b/src/allmydata/util/yamlutil.py index fd9fc73e2..eae1f8a6e 100644 --- a/src/allmydata/util/yamlutil.py +++ b/src/allmydata/util/yamlutil.py @@ -1,10 +1,6 @@ """ Ported to Python 3. """ -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: diff --git a/src/allmydata/web/check_results.py b/src/allmydata/web/check_results.py index 6c8810f2b..4bb34a2a8 100644 --- a/src/allmydata/web/check_results.py +++ b/src/allmydata/web/check_results.py @@ -1,10 +1,6 @@ """ Ported to Python 3. """ -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: diff --git a/src/allmydata/web/directory.py b/src/allmydata/web/directory.py index 240fdd90c..4012f93fd 100644 --- a/src/allmydata/web/directory.py +++ b/src/allmydata/web/directory.py @@ -1,10 +1,6 @@ """ Ported to Python 3. """ -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: diff --git a/src/allmydata/web/info.py b/src/allmydata/web/info.py index 2d45f9994..ff126a2a1 100644 --- a/src/allmydata/web/info.py +++ b/src/allmydata/web/info.py @@ -1,10 +1,6 @@ """ Ported to Python 3. """ -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: diff --git a/src/allmydata/web/logs.py b/src/allmydata/web/logs.py index a79440eb9..7c4d285f5 100644 --- a/src/allmydata/web/logs.py +++ b/src/allmydata/web/logs.py @@ -1,12 +1,6 @@ """ Ported to Python 3. """ -from __future__ import ( - print_function, - unicode_literals, - absolute_import, - division, -) from autobahn.twisted.resource import WebSocketResource from autobahn.twisted.websocket import ( diff --git a/src/allmydata/web/operations.py b/src/allmydata/web/operations.py index a564f8484..4319a4d9c 100644 --- a/src/allmydata/web/operations.py +++ b/src/allmydata/web/operations.py @@ -1,10 +1,6 @@ """ Ported to Python 3. """ -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: diff --git a/src/allmydata/web/private.py b/src/allmydata/web/private.py index 4f59be33a..55cace5a3 100644 --- a/src/allmydata/web/private.py +++ b/src/allmydata/web/private.py @@ -1,10 +1,6 @@ """ Ported to Python 3. """ -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: diff --git a/src/allmydata/web/status.py b/src/allmydata/web/status.py index 4a902a98b..96d68c87f 100644 --- a/src/allmydata/web/status.py +++ b/src/allmydata/web/status.py @@ -2,10 +2,6 @@ Ported to Python 3. """ -from __future__ import division -from __future__ import absolute_import -from __future__ import print_function -from __future__ import unicode_literals from future.utils import PY2 if PY2: diff --git a/src/allmydata/web/storage.py b/src/allmydata/web/storage.py index e568d5ed5..ebbef4fa3 100644 --- a/src/allmydata/web/storage.py +++ b/src/allmydata/web/storage.py @@ -1,10 +1,6 @@ """ Ported to Python 3. """ -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: diff --git a/src/allmydata/web/storage_plugins.py b/src/allmydata/web/storage_plugins.py index 41bed9d81..9be4e84af 100644 --- a/src/allmydata/web/storage_plugins.py +++ b/src/allmydata/web/storage_plugins.py @@ -4,10 +4,6 @@ of all enabled storage client plugins. Ported to Python 3. """ -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: diff --git a/src/allmydata/windows/fixups.py b/src/allmydata/windows/fixups.py index 53eb14d53..87e32a10f 100644 --- a/src/allmydata/windows/fixups.py +++ b/src/allmydata/windows/fixups.py @@ -1,4 +1,3 @@ -from __future__ import print_function from future.utils import PY3 from past.builtins import unicode diff --git a/ws_client.py b/ws_client.py index 15d717d42..b444a878a 100644 --- a/ws_client.py +++ b/ws_client.py @@ -1,4 +1,3 @@ -from __future__ import print_function import sys import json