From 3bc9b0d5440f4b08506ba7723f3d7aff4da8a2dc Mon Sep 17 00:00:00 2001 From: Itamar Turner-Trauring Date: Mon, 5 Apr 2021 13:00:27 -0400 Subject: [PATCH] Port to Python 3. --- src/allmydata/test/web/matchers.py | 12 ++++++++++++ src/allmydata/util/_python3.py | 1 + 2 files changed, 13 insertions(+) diff --git a/src/allmydata/test/web/matchers.py b/src/allmydata/test/web/matchers.py index 99c91ef5c..f764da79d 100644 --- a/src/allmydata/test/web/matchers.py +++ b/src/allmydata/test/web/matchers.py @@ -1,3 +1,15 @@ +""" +Ported to Python 3. +""" +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 attr from testtools.matchers import Mismatch diff --git a/src/allmydata/util/_python3.py b/src/allmydata/util/_python3.py index 97cfd64f8..03eafdea5 100644 --- a/src/allmydata/util/_python3.py +++ b/src/allmydata/util/_python3.py @@ -108,6 +108,7 @@ PORTED_MODULES = [ "allmydata.test.python3_tests", "allmydata.test.storage_plugin", "allmydata.test.web", + "allmydata.test.web.matchers", "allmydata.testing", "allmydata.testing.web", "allmydata.unknown",