From eb5211672c8752c07a66e6f3450b0f23b8918122 Mon Sep 17 00:00:00 2001
From: Itamar Turner-Trauring <itamar@itamarst.org>
Date: Mon, 26 Apr 2021 09:46:21 -0400
Subject: [PATCH] Tests pass on Python 3.

---
 src/allmydata/scripts/tahoe_ls.py | 2 +-
 src/allmydata/scripts/tahoe_mv.py | 6 +++---
 src/allmydata/test/cli/test_cp.py | 9 ++++-----
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/allmydata/scripts/tahoe_ls.py b/src/allmydata/scripts/tahoe_ls.py
index 91665e77b..71db3f5cb 100644
--- a/src/allmydata/scripts/tahoe_ls.py
+++ b/src/allmydata/scripts/tahoe_ls.py
@@ -45,10 +45,10 @@ def list(options):
             return resp.status
 
     data = resp.read()
-
     if options['json']:
         # The webapi server should always output printable ASCII.
         if is_printable_ascii(data):
+            data = unicode(data, "ascii")
             print(data, file=stdout)
             return 0
         else:
diff --git a/src/allmydata/scripts/tahoe_mv.py b/src/allmydata/scripts/tahoe_mv.py
index 7d13ea72a..bdaf134ff 100644
--- a/src/allmydata/scripts/tahoe_mv.py
+++ b/src/allmydata/scripts/tahoe_mv.py
@@ -1,7 +1,7 @@
 from __future__ import print_function
 
 import re
-import urllib
+from urllib.parse import quote as url_quote
 import json
 from allmydata.scripts.common import get_alias, DEFAULT_ALIAS, escape_path, \
                                      UnknownAliasError
@@ -25,7 +25,7 @@ def mv(options, mode="move"):
     except UnknownAliasError as e:
         e.display(stderr)
         return 1
-    from_url = nodeurl + "uri/%s" % urllib.quote(rootcap)
+    from_url = nodeurl + "uri/%s" % url_quote(rootcap)
     if from_path:
         from_url += "/" + escape_path(from_path)
     # figure out the source cap
@@ -43,7 +43,7 @@ def mv(options, mode="move"):
     except UnknownAliasError as e:
         e.display(stderr)
         return 1
-    to_url = nodeurl + "uri/%s" % urllib.quote(rootcap)
+    to_url = nodeurl + "uri/%s" % url_quote(rootcap)
     if path:
         to_url += "/" + escape_path(path)
 
diff --git a/src/allmydata/test/cli/test_cp.py b/src/allmydata/test/cli/test_cp.py
index e7c9d2323..a63718cae 100644
--- a/src/allmydata/test/cli/test_cp.py
+++ b/src/allmydata/test/cli/test_cp.py
@@ -99,7 +99,7 @@ class Cp(GridTestMixin, CLITestMixin, unittest.TestCase):
         fn1 = os.path.join(self.basedir, "Metallica")
         fn2 = os.path.join(outdir, "Not Metallica")
         fn3 = os.path.join(outdir, "test2")
-        DATA1 = "puppies" * 10000
+        DATA1 = b"puppies" * 10000
         fileutil.write(fn1, DATA1)
 
         d = self.do_cli("create-alias", "tahoe")
@@ -264,7 +264,6 @@ class Cp(GridTestMixin, CLITestMixin, unittest.TestCase):
         def _get_test_txt_uris(args):
             (rc, out, err) = args
             self.failUnlessEqual(rc, 0)
-            import pdb; pdb.set_trace()
             filetype, data = json.loads(out)
 
             self.failUnlessEqual(filetype, "filenode")
@@ -817,9 +816,9 @@ cp -r $DIRCAP5 $DIRCAP6 to : E9-COLLIDING-TARGETS
 """
 
 class CopyOut(GridTestMixin, CLITestMixin, unittest.TestCase):
-    FILE_CONTENTS = "file text"
-    FILE_CONTENTS_5 = "5"
-    FILE_CONTENTS_6 = "6"
+    FILE_CONTENTS = b"file text"
+    FILE_CONTENTS_5 = b"5"
+    FILE_CONTENTS_6 = b"6"
 
     def do_setup(self):
         # first we build a tahoe filesystem that contains: