Merge pull request #1358 from a-detiste/remove-future

remove old Python2 __future__ statements

Fixes ticket:4090

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:

integration/test_sftp.py

@@ -10,10 +10,6 @@
     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:

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:

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.
 

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
 

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

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

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
 

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

misc/coding_tools/check-debugging.py

@@ -8,7 +8,6 @@
 Usage: ./check-debugging.py src
 """
 
-from __future__ import print_function
 
 import sys, re, os
 

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
 

misc/coding_tools/check-umids.py

@@ -8,7 +8,6 @@
 
 # ./check-umids.py src
 
-from __future__ import print_function
 
 import sys, re, os
 

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

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

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

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

misc/operations_helpers/cpu-watcher-subscribe.py

@@ -1,6 +1,5 @@
 # -*- python -*-
 
-from __future__ import print_function
 
 from twisted.internet import reactor
 import sys

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

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
 

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

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
 

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
 

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
 

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
 

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
 

misc/operations_helpers/munin/tahoe_estimate_files

@@ -1,6 +1,5 @@
 #!/usr/bin/env python
 
-from __future__ import print_function
 
 import sys, os.path
 

misc/operations_helpers/munin/tahoe_files

@@ -18,7 +18,6 @@
 #  env.basedir_NODE3 /path/to/node3
 #
 
-from __future__ import print_function
 
 import os, sys
 

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

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

misc/operations_helpers/munin/tahoe_introstats

@@ -1,6 +1,5 @@
 #!/usr/bin/env python
 
-from __future__ import print_function
 
 import os, sys
 import urllib

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
 

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
 

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

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

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

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

misc/operations_helpers/munin/tahoe_stats

@@ -1,6 +1,5 @@
 #!/usr/bin/env python
 
-from __future__ import print_function
 
 import os
 import json

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

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

misc/operations_helpers/provisioning/test_provisioning.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 
 import unittest
 from allmydata import provisioning

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'

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:

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

misc/simulators/hashbasedsig.py

@@ -1,6 +1,5 @@
 #!python
 
-from __future__ import print_function
 
 # range of hash output lengths
 range_L_hash = [128]

misc/simulators/ringsim.py

@@ -4,7 +4,6 @@
 
 # import time
 
-from __future__ import print_function
 
 import math
 from hashlib import md5  # sha1, sha256

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
 

misc/simulators/simulator.py

@@ -1,6 +1,5 @@
 #! /usr/bin/env python
 
-from __future__ import print_function
 
 import hashlib
 import os, random

misc/simulators/sizes.py

@@ -1,6 +1,5 @@
 #! /usr/bin/env python
 
-from __future__ import print_function
 
 from future.utils import PY2
 if PY2:

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

pyinstaller.spec

@@ -1,6 +1,5 @@
 # -*- mode: python -*-
 
-from __future__ import print_function
 
 from distutils.sysconfig import get_python_lib
 import hashlib

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:

src/allmydata/_monkeypatch.py

@@ -4,10 +4,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: