From cbb2cfc0282ad6d5197d1bca71a5799b6e4d9192 Mon Sep 17 00:00:00 2001
From: Itamar Turner-Trauring <itamar@itamarst.org>
Date: Thu, 18 Feb 2021 11:52:42 -0500
Subject: [PATCH] Port to Python 3.

---
 src/allmydata/util/_python3.py |  1 +
 src/allmydata/web/info.py      | 14 ++++++++++++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/allmydata/util/_python3.py b/src/allmydata/util/_python3.py
index ada6e4a6d..a8898cda6 100644
--- a/src/allmydata/util/_python3.py
+++ b/src/allmydata/util/_python3.py
@@ -119,6 +119,7 @@ PORTED_MODULES = [
     "allmydata.web.common",
     "allmydata.web.check_results",
     "allmydata.web.filenode",
+    "allmydata.web.info",
     "allmydata.web.logs",
     "allmydata.webish",
 ]
diff --git a/src/allmydata/web/info.py b/src/allmydata/web/info.py
index 21ac0fd7e..2d45f9994 100644
--- a/src/allmydata/web/info.py
+++ b/src/allmydata/web/info.py
@@ -1,4 +1,14 @@
-from past.builtins import unicode
+"""
+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
 
 import os
 from urllib.parse import quote as urlquote
@@ -47,7 +57,7 @@ class MoreInfoElement(Element):
 
     def abbrev(self, storage_index_or_none):
         if storage_index_or_none:
-            return unicode(base32.b2a(storage_index_or_none)[:6], "ascii")
+            return str(base32.b2a(storage_index_or_none)[:6], "ascii")
         return "LIT file"
 
     def get_type(self):