From de48dff981dd25bc04cb9f15ab1c0f98cdcedf84 Mon Sep 17 00:00:00 2001 From: Chad Whitacre Date: Wed, 23 Sep 2020 08:19:07 -0400 Subject: [PATCH] Dial back future imports in common_util.py Don't set the plow too deep. --- src/allmydata/test/common_util.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/allmydata/test/common_util.py b/src/allmydata/test/common_util.py index 33e353f7a..cea37c673 100644 --- a/src/allmydata/test/common_util.py +++ b/src/allmydata/test/common_util.py @@ -4,11 +4,6 @@ from __future__ import print_function from __future__ import unicode_literals from future.utils import PY2, bord, bchr, binary_type -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 - - # XXX this is a hack that makes some tests pass on Python3, remove in the future - from ..scripts import runner import os from random import randrange @@ -18,6 +13,7 @@ from twisted.internet import reactor, defer from twisted.trial import unittest from ..util.assertutil import precondition +from ..scripts import runner from allmydata.util.encodingutil import get_io_encoding # Imported for backwards compatibility: from .common_py3 import (