From d6fc3c078e421207fef8719c295ec009c441958e Mon Sep 17 00:00:00 2001
From: Itamar Turner-Trauring <itamar@itamarst.org>
Date: Fri, 5 Mar 2021 10:26:38 -0500
Subject: [PATCH] Port to Python 3.

---
 src/allmydata/test/matchers.py | 10 ++++++++++
 src/allmydata/util/_python3.py |  1 +
 2 files changed, 11 insertions(+)

diff --git a/src/allmydata/test/matchers.py b/src/allmydata/test/matchers.py
index 2d5e74ffd..3359a7ed5 100644
--- a/src/allmydata/test/matchers.py
+++ b/src/allmydata/test/matchers.py
@@ -1,6 +1,16 @@
 """
 Testtools-style matchers useful to the Tahoe-LAFS test suite.
+
+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 attr
 
diff --git a/src/allmydata/util/_python3.py b/src/allmydata/util/_python3.py
index 82ae41e4e..aa7323900 100644
--- a/src/allmydata/util/_python3.py
+++ b/src/allmydata/util/_python3.py
@@ -87,6 +87,7 @@ PORTED_MODULES = [
     "allmydata.storage.server",
     "allmydata.storage.shares",
     "allmydata.test.no_network",
+    "allmydata.test.matchers",
     "allmydata.test.mutable.util",
     "allmydata.unknown",
     "allmydata.uri",