diff --git a/src/allmydata/scripts/common.py b/src/allmydata/scripts/common.py index bc969de93..e2f13b262 100644 --- a/src/allmydata/scripts/common.py +++ b/src/allmydata/scripts/common.py @@ -1,7 +1,19 @@ # coding: utf-8 +""" +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 +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 os, sys, textwrap import codecs from os.path import join diff --git a/src/allmydata/util/_python3.py b/src/allmydata/util/_python3.py index 67a93198b..eee8bf65b 100644 --- a/src/allmydata/util/_python3.py +++ b/src/allmydata/util/_python3.py @@ -92,6 +92,7 @@ PORTED_MODULES = [ "allmydata.scripts.backupdb" "allmydata.scripts.cli", "allmydata.scripts.common_http", + "allmydata.scripts.common", "allmydata.scripts.create_node", "allmydata.scripts.runner", "allmydata.scripts.types_",