From 8512bdcd8d1d8cf2f12606d07cc0f31bf474ef53 Mon Sep 17 00:00:00 2001
From: Itamar Turner-Trauring <itamar@itamarst.org>
Date: Mon, 12 Apr 2021 09:51:53 -0400
Subject: [PATCH] Even more progress towards passing Python 3 tests.

---
 src/allmydata/scripts/tahoe_get.py    | 4 ++--
 src/allmydata/scripts/tahoe_ls.py     | 6 +++---
 src/allmydata/test/cli/test_backup.py | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/allmydata/scripts/tahoe_get.py b/src/allmydata/scripts/tahoe_get.py
index d90baf2c9..b934f54b8 100644
--- a/src/allmydata/scripts/tahoe_get.py
+++ b/src/allmydata/scripts/tahoe_get.py
@@ -1,6 +1,6 @@
 from __future__ import print_function
 
-import urllib
+from urllib.parse import quote as url_quote
 from allmydata.scripts.common import get_alias, DEFAULT_ALIAS, escape_path, \
                                      UnknownAliasError
 from allmydata.scripts.common_http import do_http, format_http_error
@@ -20,7 +20,7 @@ def get(options):
     except UnknownAliasError as e:
         e.display(stderr)
         return 1
-    url = nodeurl + "uri/%s" % urllib.quote(rootcap)
+    url = nodeurl + "uri/%s" % url_quote(rootcap)
     if path:
         url += "/" + escape_path(path)
 
diff --git a/src/allmydata/scripts/tahoe_ls.py b/src/allmydata/scripts/tahoe_ls.py
index 650951dfe..91665e77b 100644
--- a/src/allmydata/scripts/tahoe_ls.py
+++ b/src/allmydata/scripts/tahoe_ls.py
@@ -1,7 +1,7 @@
 from __future__ import print_function
 
 from past.builtins import unicode
-from six import ensure_text
+from six import ensure_text, ensure_str
 
 import time
 from urllib.parse import quote as url_quote
@@ -153,9 +153,9 @@ def list(options):
             line.append(quote_output(name) + classify)
 
         if options["uri"]:
-            line.append(uri)
+            line.append(ensure_str(uri))
         if options["readonly-uri"]:
-            line.append(quote_output(ro_uri or "-", quotemarks=False))
+            line.append(quote_output(ensure_str(ro_uri) or "-", quotemarks=False))
 
         rows.append((encoding_error, line))
 
diff --git a/src/allmydata/test/cli/test_backup.py b/src/allmydata/test/cli/test_backup.py
index 38c3a0d02..18e26a860 100644
--- a/src/allmydata/test/cli/test_backup.py
+++ b/src/allmydata/test/cli/test_backup.py
@@ -153,7 +153,7 @@ class Backup(GridTestMixin, CLITestMixin, StallMixin, unittest.TestCase):
             lines = out.split("\n")
             children = dict([line.split() for line in lines if line])
             latest_uri = children["Latest"]
-            self.failUnless(latest_uri.startswith(b"URI:DIR2-CHK:"), latest_uri)
+            self.failUnless(latest_uri.startswith("URI:DIR2-CHK:"), latest_uri)
             childnames = children.keys()
             self.failUnlessReallyEqual(sorted(childnames), ["Archives", "Latest"])
         d.addCallback(_check1)