From 8d84be77d86f8af6e3025b237e3e681219ea2b7e Mon Sep 17 00:00:00 2001 From: Itamar Turner-Trauring Date: Mon, 27 Jul 2020 15:31:31 -0400 Subject: [PATCH] Port to Python 3. --- src/allmydata/test/test_statistics.py | 10 +++++++++- src/allmydata/util/_python3.py | 1 + 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/allmydata/test/test_statistics.py b/src/allmydata/test/test_statistics.py index 7fe23f88f..a14fb55ab 100644 --- a/src/allmydata/test/test_statistics.py +++ b/src/allmydata/test/test_statistics.py @@ -1,8 +1,16 @@ """ Tests for allmydata.util.statistics. """ +from __future__ import absolute_import +from __future__ import division +from __future__ import print_function +from __future__ import unicode_literals -from io import StringIO +from future.utils import PY2 +if PY2: + from builtins import filter, map, zip, ascii, chr, hex, input, next, oct, open, pow, round, super, bytes, dict, int, list, object, range, str, max, min # noqa: F401 + +from six.moves import StringIO # native string StringIO from twisted.trial import unittest diff --git a/src/allmydata/util/_python3.py b/src/allmydata/util/_python3.py index 53ccc6f63..f06f5bf3b 100644 --- a/src/allmydata/util/_python3.py +++ b/src/allmydata/util/_python3.py @@ -48,6 +48,7 @@ PORTED_TEST_MODULES = [ "allmydata.test.test_pipeline", "allmydata.test.test_python3", "allmydata.test.test_spans", + "allmydata.test.test_statistics", "allmydata.test.test_time_format", "allmydata.test.test_version", ]