Merge branch '3678.cli-tests-python-3' into 3679.more-cli-tests-python-3

src/allmydata/scripts/slow_operation.py

@@ -1,4 +1,6 @@
 from __future__ import print_function
+
+from past.builtins import unicode
 from six import ensure_str
 
 import os, time
@@ -26,6 +28,7 @@ class SlowOperationRunner(object):
         except UnknownAliasError as e:
             e.display(stderr)
             return 1
+        path = unicode(path, "utf-8")
         if path == '/':
             path = ''
         url = nodeurl + "uri/%s" % url_quote(rootcap)

src/allmydata/scripts/tahoe_check.py

@@ -34,6 +34,7 @@ def check_location(options, where):
     except UnknownAliasError as e:
         e.display(stderr)
         return 1
+    path = str(path, "utf-8")
     if path == '/':
         path = ''
     url = nodeurl + "uri/%s" % url_quote(rootcap)
@@ -299,6 +300,7 @@ class DeepCheckStreamer(LineOnlyReceiver, object):
         except UnknownAliasError as e:
             e.display(stderr)
             return 1
+        path = str(path, "utf-8")
         if path == '/':
             path = ''
         url = nodeurl + "uri/%s" % url_quote(rootcap)

src/allmydata/scripts/tahoe_manifest.py

@@ -1,5 +1,7 @@
 from __future__ import print_function
 
+from past.builtins import unicode
+
 from urllib.parse import quote as url_quote
 import json
 from twisted.protocols.basic import LineOnlyReceiver
@@ -34,6 +36,7 @@ class ManifestStreamer(LineOnlyReceiver, object):
         except UnknownAliasError as e:
             e.display(stderr)
             return 1
+        path = unicode(path, "utf-8")
         if path == '/':
             path = ''
         url = nodeurl + "uri/%s" % url_quote(rootcap)

src/allmydata/test/cli/test_check.py

@@ -15,7 +15,7 @@ from six.moves import cStringIO as StringIO
 
 from allmydata import uri
 from allmydata.util import base32
-from allmydata.util.encodingutil import quote_output, to_bytes
+from allmydata.util.encodingutil import to_bytes
 from allmydata.mutable.publish import MutableData
 from allmydata.immutable import upload
 from allmydata.scripts import debug