diff --git a/newsfragments/3386.minor b/newsfragments/3386.minor new file mode 100644 index 000000000..e69de29bb diff --git a/src/allmydata/storage/crawler.py b/src/allmydata/storage/crawler.py index 75dd723ce..24042c38b 100644 --- a/src/allmydata/storage/crawler.py +++ b/src/allmydata/storage/crawler.py @@ -1,4 +1,19 @@ -from future.utils import native_str, PY3 +""" +Crawl the storage server shares. + +Ported to Python 3. +""" + +from __future__ import unicode_literals +from __future__ import absolute_import +from __future__ import division +from __future__ import print_function + +from future.utils import PY2, PY3 +if PY2: + # We don't import bytes, object, dict, and list just in case they're used, + # so as not to create brittle pickles with random magic objects. + from builtins import filter, map, zip, ascii, chr, hex, input, next, oct, open, pow, round, super, range, str, max, min # noqa: F401 import os, time, struct try: diff --git a/src/allmydata/test/test_crawler.py b/src/allmydata/test/test_crawler.py index cfab04c31..04128769e 100644 --- a/src/allmydata/test/test_crawler.py +++ b/src/allmydata/test/test_crawler.py @@ -1,3 +1,9 @@ +""" +Tests for allmydata.storage.crawler. + +Ported to Python 3. +""" + from __future__ import print_function from __future__ import division from __future__ import absolute_import diff --git a/src/allmydata/util/_python3.py b/src/allmydata/util/_python3.py index ad71909f9..794edef40 100644 --- a/src/allmydata/util/_python3.py +++ b/src/allmydata/util/_python3.py @@ -32,6 +32,7 @@ PORTED_MODULES = [ "allmydata.crypto.util", "allmydata.hashtree", "allmydata.immutable.happiness_upload", + "allmydata.storage.crawler", "allmydata.test.common_py3", "allmydata.util._python3", "allmydata.util.abbreviate",