From b99033410431b3434d0e6f4614c127b118d36584 Mon Sep 17 00:00:00 2001
From: Itamar Turner-Trauring <itamar@itamarst.org>
Date: Mon, 6 Jul 2020 14:00:02 -0400
Subject: [PATCH] Add the builtins import to make Python 2 builtins match
 Python 3's.

---
 src/allmydata/test/test_humanreadable.py | 6 +++++-
 src/allmydata/util/humanreadable.py      | 4 ++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/allmydata/test/test_humanreadable.py b/src/allmydata/test/test_humanreadable.py
index cbe478daf..ec6d3f666 100644
--- a/src/allmydata/test/test_humanreadable.py
+++ b/src/allmydata/test/test_humanreadable.py
@@ -9,6 +9,10 @@ from __future__ import absolute_import
 from __future__ import division
 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, int, list, object, range, str, max, min  # noqa: F401
+
 from past.builtins import long
 
 from twisted.trial import unittest
@@ -27,7 +31,7 @@ class NoArgumentException(Exception):
 class HumanReadable(unittest.TestCase):
     def test_repr(self):
         hr = humanreadable.hr
-        self.failUnlessEqual(hr(foo), "<foo() at test_humanreadable.py:15>")
+        self.failUnlessEqual(hr(foo), "<foo() at test_humanreadable.py:24>")
         self.failUnlessEqual(hr(self.test_repr),
                              "<bound method HumanReadable.test_repr of <allmydata.test.test_humanreadable.HumanReadable testMethod=test_repr>>")
         self.failUnlessEqual(hr(long(1)), "1")
diff --git a/src/allmydata/util/humanreadable.py b/src/allmydata/util/humanreadable.py
index edddcdf4b..8c7079c3a 100644
--- a/src/allmydata/util/humanreadable.py
+++ b/src/allmydata/util/humanreadable.py
@@ -9,6 +9,10 @@ from __future__ import absolute_import
 from __future__ import print_function
 from __future__ import unicode_literals
 
+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, int, list, object, range, str, max, min  # noqa: F401
+
 import os
 from reprlib import Repr