From 6fd8ae1cc924b8d5f24547466e14f7c9916f2376 Mon Sep 17 00:00:00 2001 From: Itamar Turner-Trauring Date: Thu, 20 Aug 2020 14:55:49 -0400 Subject: [PATCH] Finish port to Python 3. --- src/allmydata/storage/expirer.py | 10 ++++++++++ src/allmydata/util/_python3.py | 1 + 2 files changed, 11 insertions(+) diff --git a/src/allmydata/storage/expirer.py b/src/allmydata/storage/expirer.py index a13c188bd..ffe2bf774 100644 --- a/src/allmydata/storage/expirer.py +++ b/src/allmydata/storage/expirer.py @@ -1,3 +1,13 @@ +from __future__ import division +from __future__ import absolute_import +from __future__ import print_function +from __future__ import unicode_literals + +from future.utils import PY2 +if PY2: + # We omit anything that might end up in pickle, just in case. + from future.builtins import filter, map, zip, ascii, chr, hex, input, next, oct, open, pow, round, super, range, str, max, min # noqa: F401 + import time, os, pickle, struct from allmydata.storage.crawler import ShareCrawler from allmydata.storage.shares import get_share_file diff --git a/src/allmydata/util/_python3.py b/src/allmydata/util/_python3.py index b54d0a28f..da9295f4e 100644 --- a/src/allmydata/util/_python3.py +++ b/src/allmydata/util/_python3.py @@ -33,6 +33,7 @@ PORTED_MODULES = [ "allmydata.hashtree", "allmydata.immutable.happiness_upload", "allmydata.storage.crawler", + "allmydata.storage.expirer", "allmydata.test.common_py3", "allmydata.util._python3", "allmydata.util.abbreviate",