From 2dfaa3ac2f0e6d7a5918e4395cd7bfffe51f536b Mon Sep 17 00:00:00 2001
From: Itamar Turner-Trauring <itamar@itamarst.org>
Date: Thu, 18 Mar 2021 11:08:23 -0400
Subject: [PATCH] Ported to Python 3.

---
 src/allmydata/test/cli/test_status.py | 21 +++++++++++++++++----
 src/allmydata/util/_python3.py        |  1 +
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/src/allmydata/test/cli/test_status.py b/src/allmydata/test/cli/test_status.py
index 35cd26894..a04939429 100644
--- a/src/allmydata/test/cli/test_status.py
+++ b/src/allmydata/test/cli/test_status.py
@@ -1,3 +1,16 @@
+"""
+Ported to Python 3.
+"""
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+from __future__ import unicode_literals
+
+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
+from six import ensure_text
+
 import os
 import mock
 import tempfile
@@ -122,18 +135,18 @@ class CommandStatus(unittest.TestCase):
     @mock.patch('sys.stdout', StringIO())
     def test_no_operations(self, http):
         values = [
-            StringIO(json.dumps({
+            StringIO(ensure_text(json.dumps({
                 "active": [],
                 "recent": [],
-            })),
-            StringIO(json.dumps({
+            }))),
+            StringIO(ensure_text(json.dumps({
                 "counters": {
                     "bytes_downloaded": 0,
                 },
                 "stats": {
                     "node.uptime": 0,
                 }
-            })),
+            }))),
         ]
         http.side_effect = lambda *args, **kw: values.pop(0)
         do_status(self.options)
diff --git a/src/allmydata/util/_python3.py b/src/allmydata/util/_python3.py
index 2944592bd..42e04135a 100644
--- a/src/allmydata/util/_python3.py
+++ b/src/allmydata/util/_python3.py
@@ -142,6 +142,7 @@ PORTED_MODULES = [
 PORTED_TEST_MODULES = [
     "allmydata.test.cli.test_alias",
     "allmydata.test.cli.test_create",
+    "allmydata.test.cli.test_status",
 
     "allmydata.test.mutable.test_checker",
     "allmydata.test.mutable.test_datahandle",