diff --git a/src/allmydata/scripts/common.py b/src/allmydata/scripts/common.py index 336c7b4ef..13f67abab 100644 --- a/src/allmydata/scripts/common.py +++ b/src/allmydata/scripts/common.py @@ -5,7 +5,9 @@ import codecs from os.path import join # BBB: Python 2 compatibility -from builtins import str +from future.utils import PY2 +if PY2: + from future.builtins import str # noqa: F401 from six.moves.configparser import NoSectionError from twisted.python import usage diff --git a/src/allmydata/scripts/stats_gatherer.py b/src/allmydata/scripts/stats_gatherer.py index 8e1c7dc2a..57136f872 100644 --- a/src/allmydata/scripts/stats_gatherer.py +++ b/src/allmydata/scripts/stats_gatherer.py @@ -3,7 +3,9 @@ from __future__ import print_function import os # BBB: Python 2 compatibility -from builtins import str +from future.utils import PY2 +if PY2: + from future.builtins import str # noqa: F401 from twisted.python import usage diff --git a/src/allmydata/scripts/tahoe_check.py b/src/allmydata/scripts/tahoe_check.py index c5f4fc235..6531ec285 100644 --- a/src/allmydata/scripts/tahoe_check.py +++ b/src/allmydata/scripts/tahoe_check.py @@ -4,7 +4,9 @@ import urllib import json # BBB: Python 2 compatibility -from builtins import str +from future.utils import PY2 +if PY2: + from future.builtins import str # noqa: F401 from twisted.protocols.basic import LineOnlyReceiver diff --git a/src/allmydata/stats.py b/src/allmydata/stats.py index a4d52b08d..e8e3e2965 100644 --- a/src/allmydata/stats.py +++ b/src/allmydata/stats.py @@ -7,7 +7,9 @@ import time from collections import deque # BBB: Python 2 compatibility -from builtins import str +from future.utils import PY2 +if PY2: + from future.builtins import str # noqa: F401 from twisted.internet import reactor from twisted.application import service diff --git a/src/allmydata/test/check_load.py b/src/allmydata/test/check_load.py index 548404060..3a8e835de 100644 --- a/src/allmydata/test/check_load.py +++ b/src/allmydata/test/check_load.py @@ -38,7 +38,9 @@ import os, sys, httplib, binascii import urllib, json, random, time, urlparse # BBB: Python 2 compatibility -from builtins import str +from future.utils import PY2 +if PY2: + from future.builtins import str # noqa: F401 if sys.argv[1] == "--stats": statsfiles = sys.argv[2:] diff --git a/src/allmydata/test/check_memory.py b/src/allmydata/test/check_memory.py index 2b86d0abf..174b69d4f 100644 --- a/src/allmydata/test/check_memory.py +++ b/src/allmydata/test/check_memory.py @@ -3,7 +3,9 @@ from __future__ import print_function import os, shutil, sys, urllib, time, stat, urlparse # BBB: Python 2 compatibility -from builtins import str +from future.utils import PY2 +if PY2: + from future.builtins import str # noqa: F401 from six.moves import cStringIO as StringIO from twisted.internet import defer, reactor, protocol, error diff --git a/src/allmydata/test/mutable/test_version.py b/src/allmydata/test/mutable/test_version.py index d26e684ed..35dea9411 100644 --- a/src/allmydata/test/mutable/test_version.py +++ b/src/allmydata/test/mutable/test_version.py @@ -3,7 +3,9 @@ from __future__ import print_function import os # BBB: Python 2 compatibility -from builtins import str +from future.utils import PY2 +if PY2: + from future.builtins import str # noqa: F401 from six.moves import cStringIO as StringIO from twisted.internet import defer diff --git a/src/allmydata/test/test_auth.py b/src/allmydata/test/test_auth.py index eb59b955b..d6daba24e 100644 --- a/src/allmydata/test/test_auth.py +++ b/src/allmydata/test/test_auth.py @@ -1,5 +1,7 @@ # BBB: Python 2 compatibility -from builtins import str +from future.utils import PY2 +if PY2: + from future.builtins import str # noqa: F401 from twisted.trial import unittest from twisted.python import filepath