diff --git a/src/allmydata/scripts/tahoe_put.py b/src/allmydata/scripts/tahoe_put.py index 8db705d01..1ea45e8ea 100644 --- a/src/allmydata/scripts/tahoe_put.py +++ b/src/allmydata/scripts/tahoe_put.py @@ -1,7 +1,14 @@ +""" +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 -from past.builtins import unicode +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 from io import BytesIO from urllib.parse import quote as url_quote @@ -56,7 +63,7 @@ def put(options): except UnknownAliasError as e: e.display(stderr) return 1 - path = unicode(path, "utf-8") + path = str(path, "utf-8") if path.startswith("/"): suggestion = to_file.replace(u"/", u"", 1) print("Error: The remote filename must not start with a slash", file=stderr) diff --git a/src/allmydata/util/_python3.py b/src/allmydata/util/_python3.py index 829cae829..030b7efd5 100644 --- a/src/allmydata/util/_python3.py +++ b/src/allmydata/util/_python3.py @@ -112,6 +112,7 @@ PORTED_MODULES = [ "allmydata.scripts.tahoe_manifest", "allmydata.scripts.tahoe_mkdir", "allmydata.scripts.tahoe_mv", + "allmydata.scripts.tahoe_put", "allmydata.scripts.types_", "allmydata.stats", "allmydata.storage_client",