From b4e6686211cb105f1b61154115868b2efa361fd1 Mon Sep 17 00:00:00 2001
From: Itamar Turner-Trauring <itamar@itamarst.org>
Date: Wed, 22 Jul 2020 10:29:44 -0400
Subject: [PATCH] Port to Python 3.

---
 src/allmydata/test/test_observer.py | 14 ++++++++++++++
 src/allmydata/util/_python3.py      |  2 ++
 src/allmydata/util/observer.py      | 15 ++++++++++++++-
 3 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/src/allmydata/test/test_observer.py b/src/allmydata/test/test_observer.py
index 32fd0a395..b37f0d3e1 100644
--- a/src/allmydata/test/test_observer.py
+++ b/src/allmydata/test/test_observer.py
@@ -1,3 +1,17 @@
+"""
+Tests for allmydata.util.observer.
+
+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 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 twisted.trial import unittest
 from twisted.internet import defer, reactor
diff --git a/src/allmydata/util/_python3.py b/src/allmydata/util/_python3.py
index ea4e0e702..92ad34174 100644
--- a/src/allmydata/util/_python3.py
+++ b/src/allmydata/util/_python3.py
@@ -22,6 +22,7 @@ PORTED_MODULES = [
     "allmydata.util.humanreadable",
     "allmydata.util.mathutil",
     "allmydata.util.namespace",
+    "allmydata.util.observer",
     "allmydata.util.pollmixin",
     "allmydata.util._python3",
 ]
@@ -31,6 +32,7 @@ PORTED_TEST_MODULES = [
     "allmydata.test.test_base62",
     "allmydata.test.test_deferredutil",
     "allmydata.test.test_humanreadable",
+    "allmydata.test.test_observer",
     "allmydata.test.test_python3",
 ]
 
diff --git a/src/allmydata/util/observer.py b/src/allmydata/util/observer.py
index 30eb92329..d5003dfb3 100644
--- a/src/allmydata/util/observer.py
+++ b/src/allmydata/util/observer.py
@@ -1,4 +1,17 @@
-# -*- test-case-name: allmydata.test.test_observer -*-
+"""
+Observer for Twisted code.
+
+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 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 weakref
 from twisted.internet import defer