From 22f8b9b4281e15d3851eb7097e2c076907c621be Mon Sep 17 00:00:00 2001
From: Itamar Turner-Trauring <itamar@itamarst.org>
Date: Wed, 12 May 2021 09:25:52 -0400
Subject: [PATCH] Port to Python 3.

---
 integration/conftest.py        | 10 ++++++++++
 integration/util.py            | 26 ++++++++++++++++++--------
 src/allmydata/util/_python3.py |  4 ++++
 3 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/integration/conftest.py b/integration/conftest.py
index 918f2d4c9..39ff3b42b 100644
--- a/integration/conftest.py
+++ b/integration/conftest.py
@@ -1,5 +1,15 @@
+"""
+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
+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
+
 import sys
 import shutil
 from time import sleep
diff --git a/integration/util.py b/integration/util.py
index c8ba5d16b..7c7a1efd2 100644
--- a/integration/util.py
+++ b/integration/util.py
@@ -1,4 +1,14 @@
-from past.builtins import unicode
+"""
+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
+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
 
 import sys
 import time
@@ -96,11 +106,11 @@ class _DumpOutputProtocol(ProcessProtocol):
             self.done.errback(reason)
 
     def outReceived(self, data):
-        data = unicode(data, sys.stdout.encoding)
+        data = str(data, sys.stdout.encoding)
         self._out.write(data)
 
     def errReceived(self, data):
-        data = unicode(data, sys.stdout.encoding)
+        data = str(data, sys.stdout.encoding)
         self._out.write(data)
 
 
@@ -120,7 +130,7 @@ class _MagicTextProtocol(ProcessProtocol):
         self.exited.callback(None)
 
     def outReceived(self, data):
-        data = unicode(data, sys.stdout.encoding)
+        data = str(data, sys.stdout.encoding)
         sys.stdout.write(data)
         self._output.write(data)
         if not self.magic_seen.called and self._magic_text in self._output.getvalue():
@@ -128,7 +138,7 @@ class _MagicTextProtocol(ProcessProtocol):
             self.magic_seen.callback(self)
 
     def errReceived(self, data):
-        data = unicode(data, sys.stderr.encoding)
+        data = str(data, sys.stderr.encoding)
         sys.stdout.write(data)
 
 
@@ -269,9 +279,9 @@ def _create_node(reactor, request, temp_dir, introducer_furl, flog_gatherer, nam
             '--hostname', 'localhost',
             '--listen', 'tcp',
             '--webport', web_port,
-            '--shares-needed', unicode(needed),
-            '--shares-happy', unicode(happy),
-            '--shares-total', unicode(total),
+            '--shares-needed', str(needed),
+            '--shares-happy', str(happy),
+            '--shares-total', str(total),
             '--helper',
         ]
         if not storage:
diff --git a/src/allmydata/util/_python3.py b/src/allmydata/util/_python3.py
index c15301c3c..f6cd9752c 100644
--- a/src/allmydata/util/_python3.py
+++ b/src/allmydata/util/_python3.py
@@ -279,4 +279,8 @@ PORTED_TEST_MODULES = [
     "allmydata.test.web.test_web",
     "allmydata.test.web.test_webish",
     "allmydata.test.test_windows",
+
+    "integration",
+    "integration.conftest",
+    "integration.util",
 ]