From 6c85f392dd1472ff48e10a4df3c9179f2ea1d9fb Mon Sep 17 00:00:00 2001
From: Itamar Turner-Trauring <itamar@itamarst.org>
Date: Thu, 17 Sep 2020 13:39:47 -0400
Subject: [PATCH] Fix another future newbytes leak that was breaking Foolscap.

---
 src/allmydata/uri.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/allmydata/uri.py b/src/allmydata/uri.py
index 253cb109c..bad0dd9df 100644
--- a/src/allmydata/uri.py
+++ b/src/allmydata/uri.py
@@ -13,8 +13,9 @@ 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
+    # Don't import bytes or str, to prevent leaks.
+    from future.builtins import filter, map, zip, ascii, chr, hex, input, next, oct, open, pow, round, super, dict, list, object, range, max, min  # noqa: F401
+    str = unicode
 
 from past.builtins import unicode, long