From 2cc21e98937968dadddca6008102805f7c24bdd1 Mon Sep 17 00:00:00 2001
From: Itamar Turner-Trauring <itamar@itamarst.org>
Date: Mon, 24 Aug 2020 13:57:46 -0400
Subject: [PATCH] Finish the port.

---
 newsfragments/3367.minor       |  0
 src/allmydata/test/test_uri.py |  5 +++--
 src/allmydata/uri.py           | 18 ++++++++++++++++++
 src/allmydata/util/_python3.py |  3 ++-
 4 files changed, 23 insertions(+), 3 deletions(-)
 create mode 100644 newsfragments/3367.minor

diff --git a/newsfragments/3367.minor b/newsfragments/3367.minor
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/allmydata/test/test_uri.py b/src/allmydata/test/test_uri.py
index 005cdf597..f89fae151 100644
--- a/src/allmydata/test/test_uri.py
+++ b/src/allmydata/test/test_uri.py
@@ -1,5 +1,6 @@
-
 """
+Tests for allmydata.uri.
+
 Ported to Python 3.
 """
 
@@ -10,7 +11,7 @@ from __future__ import unicode_literals
 
 from future.utils import PY2
 if PY2:
-    from builtins import filter, map, zip, ascii, chr, dict, hex, input, next, oct, open, pow, round, super, bytes, int, list, object, range, str, max, min  # noqa: F401
+    from future.builtins import filter, map, zip, ascii, chr, dict, hex, input, next, oct, open, pow, round, super, bytes, int, list, object, range, str, max, min  # noqa: F401
 
 import os
 from twisted.trial import unittest
diff --git a/src/allmydata/uri.py b/src/allmydata/uri.py
index 62f4025fb..b601226da 100644
--- a/src/allmydata/uri.py
+++ b/src/allmydata/uri.py
@@ -1,3 +1,21 @@
+"""
+URIs (kinda sorta, really they're capabilities?).
+
+Ported to Python 3.
+
+Methods ending in to_string() are actually to_bytes(), possibly should be fixed
+in follow-up port.
+"""
+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:
+    # Don't import bytes, to prevent leaks.
+    from future.builtins import filter, map, zip, ascii, chr, hex, input, next, oct, open, pow, round, super, dict, list, object, range, str, max, min  # noqa: F401
+
 from past.builtins import unicode, long
 
 import re
diff --git a/src/allmydata/util/_python3.py b/src/allmydata/util/_python3.py
index 84c08a36c..2351f3707 100644
--- a/src/allmydata/util/_python3.py
+++ b/src/allmydata/util/_python3.py
@@ -20,7 +20,7 @@ from __future__ import print_function
 
 from future.utils import PY2
 if PY2:
-    from 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 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
 
 # Keep these sorted alphabetically, to reduce merge conflicts:
 PORTED_MODULES = [
@@ -34,6 +34,7 @@ PORTED_MODULES = [
     "allmydata.immutable.happiness_upload",
     "allmydata.storage.crawler",
     "allmydata.test.common_py3",
+    "allmydata.uri",
     "allmydata.util._python3",
     "allmydata.util.abbreviate",
     "allmydata.util.assertutil",