From 21e3b355ecdd31828295110615aa4b61eb8a07ef Mon Sep 17 00:00:00 2001 From: Itamar Turner-Trauring Date: Fri, 25 Sep 2020 14:03:25 -0400 Subject: [PATCH] Finish porting to Python 3. --- newsfragments/3446.minor | 0 src/allmydata/test/test_helper.py | 11 +++++++++-- src/allmydata/util/_python3.py | 1 + 3 files changed, 10 insertions(+), 2 deletions(-) create mode 100644 newsfragments/3446.minor diff --git a/newsfragments/3446.minor b/newsfragments/3446.minor new file mode 100644 index 000000000..e69de29bb diff --git a/src/allmydata/test/test_helper.py b/src/allmydata/test/test_helper.py index 0c98e4af8..c47da3277 100644 --- a/src/allmydata/test/test_helper.py +++ b/src/allmydata/test/test_helper.py @@ -1,4 +1,11 @@ -from future.builtins import str +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 import os from twisted.internet import defer @@ -136,7 +143,7 @@ class AssistedUpload(unittest.TestCase): self.s.tub = t # we never actually use this for network traffic, so it can use a # bogus host/port - t.setLocation("bogus:1234") + t.setLocation(b"bogus:1234") def setUpHelper(self, basedir, helper_class=Helper_fake_upload): fileutil.make_dirs(basedir) diff --git a/src/allmydata/util/_python3.py b/src/allmydata/util/_python3.py index fc2530f15..6347b5fc2 100644 --- a/src/allmydata/util/_python3.py +++ b/src/allmydata/util/_python3.py @@ -90,6 +90,7 @@ PORTED_TEST_MODULES = [ "allmydata.test.test_happiness", "allmydata.test.test_hashtree", "allmydata.test.test_hashutil", + "allmydata.test.test_helper", "allmydata.test.test_humanreadable", "allmydata.test.test_iputil", "allmydata.test.test_log",