From 03fb936716689447edb676c85044cabd79833f3d Mon Sep 17 00:00:00 2001 From: Itamar Turner-Trauring Date: Tue, 12 Jan 2021 14:25:16 -0500 Subject: [PATCH] Port to Python 3. --- src/allmydata/test/web/test_private.py | 6 ++++++ src/allmydata/util/_python3.py | 1 + 2 files changed, 7 insertions(+) diff --git a/src/allmydata/test/web/test_private.py b/src/allmydata/test/web/test_private.py index 583f629f5..293796b1c 100644 --- a/src/allmydata/test/web/test_private.py +++ b/src/allmydata/test/web/test_private.py @@ -1,5 +1,7 @@ """ Tests for ``allmydata.web.private``. + +Ported to Python 3. """ from __future__ import ( @@ -9,6 +11,10 @@ from __future__ 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 + from future.builtins import str from testtools.matchers import ( diff --git a/src/allmydata/util/_python3.py b/src/allmydata/util/_python3.py index 63aa5bb0a..7cd80335c 100644 --- a/src/allmydata/util/_python3.py +++ b/src/allmydata/util/_python3.py @@ -189,6 +189,7 @@ PORTED_TEST_MODULES = [ "allmydata.test.web.test_grid", "allmydata.test.web.test_introducer", "allmydata.test.web.test_logs", + "allmydata.test.web.test_private", "allmydata.test.web.test_status", "allmydata.test.web.test_util", "allmydata.test.web.test_webish",