Changeset 17f0676 in trunk

Timestamp:

2020-10-09T14:22:17Z (5 years ago)

Author:

GitHub <noreply@…>

Branches:

master

Children:

3ea18ca

Parents:

c680b1d (diff), cc8c9c0 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Itamar Turner-Trauring <itamar@…> (2020-10-09 14:22:17)

git-committer:

GitHub <noreply@…> (2020-10-09 14:22:17)

Message:

Merge branch 'master' into 3459.test-checker-python-3

Files:

• Makefile (modified) (1 diff)
• misc/python3/Makefile (modified) (1 diff)
• newsfragments/3455.minor (added)
• newsfragments/3456.minor (added)
• newsfragments/3458.minor (added)
• newsfragments/3462.minor (added)
• newsfragments/3463.minor (added)
• newsfragments/3464.minor (added)
• src/allmydata/__init__.py (modified) (1 diff)
• src/allmydata/_monkeypatch.py (added)
• src/allmydata/client.py (modified) (1 diff)
• src/allmydata/immutable/downloader/share.py (modified) (2 diffs)
• src/allmydata/immutable/encode.py (modified) (2 diffs)
• src/allmydata/immutable/filenode.py (modified) (1 diff)
• src/allmydata/immutable/layout.py (modified) (1 diff)
• src/allmydata/immutable/upload.py (modified) (7 diffs)
• src/allmydata/node.py (modified) (4 diffs)
• src/allmydata/scripts/common.py (modified) (1 diff)
• src/allmydata/scripts/stats_gatherer.py (modified) (1 diff)
• src/allmydata/scripts/tahoe_check.py (modified) (1 diff)
• src/allmydata/stats.py (modified) (1 diff)
• src/allmydata/test/check_load.py (modified) (1 diff)
• src/allmydata/test/check_memory.py (modified) (1 diff)
• src/allmydata/test/common.py (modified) (5 diffs)
• src/allmydata/test/common_py3.py (deleted)
• src/allmydata/test/common_util.py (modified) (3 diffs)
• src/allmydata/test/eliotutil.py (modified) (2 diffs)
• src/allmydata/test/mutable/test_version.py (modified) (1 diff)
• src/allmydata/test/test_auth.py (modified) (1 diff)
• src/allmydata/test/test_client.py (modified) (19 diffs)
• src/allmydata/test/test_crawler.py (modified) (1 diff)
• src/allmydata/test/test_deepcheck.py (modified) (1 diff)
• src/allmydata/test/test_encodingutil.py (modified) (1 diff)
• src/allmydata/test/test_happiness.py (modified) (1 diff)
• src/allmydata/test/test_iputil.py (modified) (1 diff)
• src/allmydata/test/test_node.py (modified) (4 diffs)
• src/allmydata/test/test_storage.py (modified) (1 diff)
• src/allmydata/test/test_storage_web.py (modified) (1 diff)
• src/allmydata/test/test_time_format.py (modified) (1 diff)
• src/allmydata/test/test_upload.py (modified) (2 diffs)
• src/allmydata/test/web/test_introducer.py (modified) (1 diff)
• src/allmydata/test/web/test_web.py (modified) (1 diff)
• src/allmydata/util/_python3.py (modified) (3 diffs)

Makefile ¶

@@ -52 +52 @@
 test-venv-coverage:
 # Special handling for reporting coverage even when the test run fails
+        rm -f ./.coverage.*
         test_exit=
         $(VIRTUAL_ENV)/bin/coverage run -m twisted.trial --rterrors --reporter=timing \

misc/python3/Makefile ¶

@@ -1 @@
-# BBB: Python 3 porting targets
+# Python 3 porting targets
 #
 # NOTE: this Makefile requires GNU make

src/allmydata/__init__.py ¶

@@ -43 +43 @@
 from future import standard_library
 standard_library.install_aliases()
+
+
+# Monkey-patch 3rd party libraries:
+from ._monkeypatch import patch
+patch()
+del patch

src/allmydata/client.py ¶

@@ -70 +70 @@
     """
     return (
-        section_name.startswith(b"storageserver.plugins.") or
-        section_name.startswith(b"storageclient.plugins.")
+        section_name.startswith("storageserver.plugins.") or
+        section_name.startswith("storageclient.plugins.")
     )
 

src/allmydata/immutable/downloader/share.py ¶

@@ -7 +7 @@
 from __future__ import unicode_literals
 
-from future.utils import PY2, native_str
+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
@@ -766 +766 @@
 
     def _send_request(self, start, length):
-        # For some reason tests fail on Python 2 if this is not a native
-        # string...
-        return self._rref.callRemote(native_str("read"), start, length)
+        return self._rref.callRemote("read", start, length)
 
     def _got_data(self, data, start, length, block_ev, lp):

src/allmydata/immutable/encode.py ¶

@@ -1 +1 @@
 # -*- test-case-name: allmydata.test.test_encode -*-
+
+"""
+Ported to Python 3.
+"""
+
+from __future__ import division
+from __future__ import absolute_import
+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 time
@@ -469 +482 @@
                       self.segment_size*(segnum+1),
                       self.segment_size*self.num_segments,
-                      100 * (segnum+1) / self.num_segments,
+                      100 * (segnum+1) // self.num_segments,
                       ),
                      level=log.OPERATIONAL)

src/allmydata/immutable/filenode.py ¶

@@ +1 @@
+"""
+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
+
 from functools import reduce
 import binascii

src/allmydata/immutable/layout.py ¶

@@ +1 @@
+"""
+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 struct
 from zope.interface import implementer

src/allmydata/immutable/upload.py ¶

@@ +1 @@
+"""
+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, native_str
+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
 from past.builtins import long, unicode
 
@@ -67 +79 @@
         server: list(shares)
         for (server, shares)
-        in existing_shares.iteritems()
+        in existing_shares.items()
     }
 
@@ -80 +92 @@
         sharenum: base32.b2a(serverid)
         for (sharenum, serverid)
-        in happiness_mappings.iteritems()
+        in happiness_mappings.items()
     }
 
@@ -151 +163 @@
     # helper, and it does *not* need to match the fully-qualified
     # package/module/class name
-    typeToCopy = "allmydata.upload.UploadResults.tahoe.allmydata.com"
+    #
+    # Needs to be native string to make Foolscap happy.
+    typeToCopy = native_str("allmydata.upload.UploadResults.tahoe.allmydata.com")
     copytype = typeToCopy
 
@@ -284 +298 @@
         (alreadygot, buckets) = alreadygot_and_buckets
         b = {}
-        for sharenum, rref in buckets.items():
+        for sharenum, rref in list(buckets.items()):
             bp = self.wbp_class(rref, self._server, self.sharesize,
                                 self.blocksize,
@@ -781 +795 @@
         shares_to_ask = set()
         servermap = self._share_placements
-        for shnum, tracker_id in servermap.items():
+        for shnum, tracker_id in list(servermap.items()):
             if tracker_id == None:
                 continue
@@ -1575 +1589 @@
 
         sharemap = upload_results.sharemap
-        if str in [type(v) for v in sharemap.values()]:
+        if any(isinstance(v, (bytes, unicode)) for v in sharemap.values()):
             upload_results.sharemap = None
 

src/allmydata/node.py ¶

@@ -10 +10 @@
 import types
 import errno
+from io import StringIO
+import tempfile
+from base64 import b32decode, b32encode
+
+# Python 2 compatibility
 from six.moves import configparser
-import tempfile
-from io import BytesIO
-from base64 import b32decode, b32encode
+from future.utils import PY2
+if PY2:
+    from io import BytesIO as StringIO  # noqa: F811
 
 from twisted.python import log as twlog
@@ -71 +76 @@
 # reports.
 for thing, things_version in get_package_versions().items():
-    app_versions.add_version(thing, str(things_version))
+    app_versions.add_version(thing, things_version)
 
 # group 1 will be addr (dotted quad string), group 3 if any will be portnum (string)
@@ -207 +212 @@
     # load configuration from in-memory string
     parser = configparser.SafeConfigParser()
-    parser.readfp(BytesIO(config_str))
+    parser.readfp(StringIO(config_str))
 
     fname = "<in-memory>"
@@ -822 +827 @@
             # o might be a FileLogObserver's .emit method
             if type(o) is type(self.setup_logging): # bound method
-                ob = o.im_self
+                ob = o.__self__
                 if isinstance(ob, twlog.FileLogObserver):
-                    newmeth = types.UnboundMethodType(formatTimeTahoeStyle, ob, ob.__class__)
+                    newmeth = types.MethodType(formatTimeTahoeStyle, ob)
                     ob.formatTime = newmeth
         # TODO: twisted >2.5.0 offers maxRotatedFiles=50

src/allmydata/scripts/common.py ¶

@@ -5 +5 @@
 from os.path import join
 
-# BBB: Python 2 compatibility
+# Python 2 compatibility
 from future.utils import PY2
 if PY2:

src/allmydata/scripts/stats_gatherer.py ¶

@@ -3 +3 @@
 import os
 
-# BBB: Python 2 compatibility
+# Python 2 compatibility
 from future.utils import PY2
 if PY2:

src/allmydata/scripts/tahoe_check.py ¶

@@ -4 +4 @@
 import json
 
-# BBB: Python 2 compatibility
+# Python 2 compatibility
 from future.utils import PY2
 if PY2:

src/allmydata/stats.py ¶

@@ -7 +7 @@
 from collections import deque
 
-# BBB: Python 2 compatibility
+# Python 2 compatibility
 from future.utils import PY2
 if PY2:

src/allmydata/test/check_load.py ¶

@@ -38 +38 @@
 import urllib, json, random, time, urlparse
 
-# BBB: Python 2 compatibility
+# Python 2 compatibility
 from future.utils import PY2
 if PY2:

src/allmydata/test/check_memory.py ¶

@@ -3 +3 @@
 import os, shutil, sys, urllib, time, stat, urlparse
 
-# BBB: Python 2 compatibility
+# Python 2 compatibility
 from future.utils import PY2
 if PY2:

src/allmydata/test/common.py ¶

@@ -47 +47 @@
 )
 
+from twisted.application import service
 from twisted.plugin import IPlugin
 from twisted.internet import defer
@@ -88 +89 @@
     EliotLoggedRunTest,
 )
-# Backwards compatibility imports:
-from .common_py3 import LoggingServiceParent, ShouldFailMixin  # noqa: F401
+from .common_util import ShouldFailMixin  # noqa: F401
 
 
@@ -95 +95 @@
 
 EMPTY_CLIENT_CONFIG = config_from_string(
-    b"/dev/null",
-    b"tub.port",
-    b""
+    "/dev/null",
+    "tub.port",
+    ""
 )
 
@@ -250 +250 @@
         self.config = config_from_string(
             self.basedir.asTextMode().path,
-            u"tub.port",
-b"""
+            "tub.port",
+"""
 [node]
 {node_config}
@@ -782 +782 @@
 
 
+class LoggingServiceParent(service.MultiService):
+    def log(self, *args, **kwargs):
+        return log.msg(*args, **kwargs)
+
+
 TEST_DATA=b"\x02"*(Uploader.URI_LIT_SIZE_THRESHOLD+1)
 

src/allmydata/test/common_util.py ¶

@@ -2 +2 @@
 
 import os
+import time
+import signal
 from random import randrange
 from six.moves import StringIO
 
 from twisted.internet import reactor, defer
+from twisted.python import failure
 from twisted.trial import unittest
 
 from ..util.assertutil import precondition
 from ..scripts import runner
-from allmydata.util.encodingutil import get_io_encoding
+from allmydata.util.encodingutil import unicode_platform, get_filesystem_encoding, get_io_encoding
 # Imported for backwards compatibility:
 from future.utils import bord, bchr, binary_type
-from .common_py3 import (
-    SignalMixin, skip_if_cannot_represent_filename, ReallyEqualMixin, ShouldFailMixin
-)
-
+from past.builtins import unicode
+
+
+def skip_if_cannot_represent_filename(u):
+    precondition(isinstance(u, unicode))
+
+    enc = get_filesystem_encoding()
+    if not unicode_platform():
+        try:
+            u.encode(enc)
+        except UnicodeEncodeError:
+            raise unittest.SkipTest("A non-ASCII filename could not be encoded on this platform.")
 
 def skip_if_cannot_represent_argv(u):
@@ -79 +90 @@
 
 
+class ReallyEqualMixin(object):
+    def failUnlessReallyEqual(self, a, b, msg=None):
+        self.assertEqual(a, b, msg)
+        self.assertEqual(type(a), type(b), "a :: %r (%s), b :: %r (%s), %r" % (a, type(a), b, type(b), msg))
+
+
+class SignalMixin(object):
+    # This class is necessary for any code which wants to use Processes
+    # outside the usual reactor.run() environment. It is copied from
+    # Twisted's twisted.test.test_process . Note that Twisted-8.2.0 uses
+    # something rather different.
+    sigchldHandler = None
+
+    def setUp(self):
+        # make sure SIGCHLD handler is installed, as it should be on
+        # reactor.run(). problem is reactor may not have been run when this
+        # test runs.
+        if hasattr(reactor, "_handleSigchld") and hasattr(signal, "SIGCHLD"):
+            self.sigchldHandler = signal.signal(signal.SIGCHLD,
+                                                reactor._handleSigchld)
+        return super(SignalMixin, self).setUp()
+
+    def tearDown(self):
+        if self.sigchldHandler:
+            signal.signal(signal.SIGCHLD, self.sigchldHandler)
+        return super(SignalMixin, self).tearDown()
+
+
 class StallMixin(object):
     def stall(self, res=None, delay=1):
         d = defer.Deferred()
         reactor.callLater(delay, d.callback, res)
+        return d
+
+
+class Marker(object):
+    pass
+
+class FakeCanary(object):
+    """For use in storage tests.
+    """
+    def __init__(self, ignore_disconnectors=False):
+        self.ignore = ignore_disconnectors
+        self.disconnectors = {}
+    def notifyOnDisconnect(self, f, *args, **kwargs):
+        if self.ignore:
+            return
+        m = Marker()
+        self.disconnectors[m] = (f, args, kwargs)
+        return m
+    def dontNotifyOnDisconnect(self, marker):
+        if self.ignore:
+            return
+        del self.disconnectors[marker]
+    def getRemoteTubID(self):
+        return None
+    def getPeer(self):
+        return "<fake>"
+
+
+class ShouldFailMixin(object):
+
+    def shouldFail(self, expected_failure, which, substring,
+                   callable, *args, **kwargs):
+        """Assert that a function call raises some exception. This is a
+        Deferred-friendly version of TestCase.assertRaises() .
+
+        Suppose you want to verify the following function:
+
+         def broken(a, b, c):
+             if a < 0:
+                 raise TypeError('a must not be negative')
+             return defer.succeed(b+c)
+
+        You can use:
+            d = self.shouldFail(TypeError, 'test name',
+                                'a must not be negative',
+                                broken, -4, 5, c=12)
+        in your test method. The 'test name' string will be included in the
+        error message, if any, because Deferred chains frequently make it
+        difficult to tell which assertion was tripped.
+
+        The substring= argument, if not None, must appear in the 'repr'
+        of the message wrapped by this Failure, or the test will fail.
+        """
+
+        assert substring is None or isinstance(substring, (bytes, unicode))
+        d = defer.maybeDeferred(callable, *args, **kwargs)
+        def done(res):
+            if isinstance(res, failure.Failure):
+                res.trap(expected_failure)
+                if substring:
+                    self.failUnless(substring in str(res),
+                                    "%s: substring '%s' not in '%s'"
+                                    % (which, substring, str(res)))
+                # return the Failure for further analysis, but in a form that
+                # doesn't make the Deferred chain think that we failed.
+                return [res]
+            else:
+                self.fail("%s was supposed to raise %s, not get '%s'" %
+                          (which, expected_failure, res))
+        d.addBoth(done)
         return d
 
@@ -131 +240 @@
         if required_to_quiesce and active:
             self.fail("Reactor was still active when it was required to be quiescent.")
+
+
+class TimezoneMixin(object):
+
+    def setTimezone(self, timezone):
+        def tzset_if_possible():
+            # Windows doesn't have time.tzset().
+            if hasattr(time, 'tzset'):
+                time.tzset()
+
+        unset = object()
+        originalTimezone = os.environ.get('TZ', unset)
+        def restoreTimezone():
+            if originalTimezone is unset:
+                del os.environ['TZ']
+            else:
+                os.environ['TZ'] = originalTimezone
+            tzset_if_possible()
+
+        os.environ['TZ'] = timezone
+        self.addCleanup(restoreTimezone)
+        tzset_if_possible()
+
+    def have_working_tzset(self):
+        return hasattr(time, 'tzset')
 
 

src/allmydata/test/eliotutil.py ¶

@@ -3 +3 @@
 """
 
-# BBB: Python 2 compatibility
+# Python 2 compatibility
 # Can't use `builtins.str` because it's not JSON encodable:
 # `exceptions.TypeError: <class 'future.types.newstr.newstr'> is not JSON-encodeable`
@@ -107 +107 @@
         # Begin an action that should comprise all messages from the decorated
         # test method.
-        with RUN_TEST(name=self.id().decode("utf-8")).context() as action:
+        with RUN_TEST(name=self.id()).context() as action:
             # When the test method Deferred fires, the RUN_TEST action is
             # done.  However, we won't have re-published the MemoryLogger

src/allmydata/test/mutable/test_version.py ¶

@@ -3 +3 @@
 import os
 
-# BBB: Python 2 compatibility
+# Python 2 compatibility
 from future.utils import PY2
 if PY2:

src/allmydata/test/test_auth.py ¶

@@ -1 @@
-# BBB: Python 2 compatibility
+# Python 2 compatibility
 from future.utils import PY2
 if PY2:

src/allmydata/test/test_client.py ¶

@@ -253 +253 @@
         """
         config = client.config_from_string(
-            b"test_storage_default_anonymous_enabled",
-            b"tub.port",
+            "test_storage_default_anonymous_enabled",
+            "tub.port",
             BASECONFIG + (
-                b"[storage]\n"
-                b"enabled = true\n"
+                "[storage]\n"
+                "enabled = true\n"
             )
         )
@@ -269 +269 @@
         config = client.config_from_string(
             self.id(),
-            b"tub.port",
+            "tub.port",
             BASECONFIG + (
-                b"[storage]\n"
-                b"enabled = true\n"
-                b"anonymous = true\n"
+                "[storage]\n"
+                "enabled = true\n"
+                "anonymous = true\n"
             )
         )
@@ -285 +285 @@
         config = client.config_from_string(
             self.id(),
-            b"tub.port",
+            "tub.port",
             BASECONFIG + (
-                b"[storage]\n"
-                b"enabled = true\n"
-                b"anonymous = false\n"
+                "[storage]\n"
+                "enabled = true\n"
+                "anonymous = false\n"
             )
         )
@@ -301 +301 @@
         config = client.config_from_string(
             self.id(),
-            b"tub.port",
+            "tub.port",
             BASECONFIG + (
-                b"[storage]\n"
-                b"enabled = false\n"
-                b"anonymous = true\n"
+                "[storage]\n"
+                "enabled = false\n"
+                "anonymous = true\n"
             )
         )
@@ -681 +681 @@
         config = client.config_from_string(
             basedir,
-            b"tub.port",
+            "tub.port",
             BASECONFIG_I % (SOME_FURL,) + (
-                b"[storage]\n"
-                b"enabled = true\n"
-                b"anonymous = true\n"
+                "[storage]\n"
+                "enabled = true\n"
+                "anonymous = true\n"
             )
         )
@@ -712 +712 @@
         config = client.config_from_string(
             basedir,
-            b"tub.port",
+            "tub.port",
             BASECONFIG_I % (SOME_FURL,) + (
-                b"[storage]\n"
-                b"enabled = true\n"
-                b"anonymous = false\n"
+                "[storage]\n"
+                "enabled = true\n"
+                "anonymous = false\n"
             )
         )
@@ -733 +733 @@
         )
         self.expectThat(
-            config.get_private_config(b"storage.furl", default=None),
+            config.get_private_config("storage.furl", default=None),
             Is(None),
         )
@@ -749 +749 @@
         enabled_config = client.config_from_string(
             basedir,
-            b"tub.port",
+            "tub.port",
             BASECONFIG_I % (SOME_FURL,) + (
-                b"[storage]\n"
-                b"enabled = true\n"
-                b"anonymous = true\n"
+                "[storage]\n"
+                "enabled = true\n"
+                "anonymous = true\n"
             )
         )
@@ -760 +760 @@
             _introducer_factory=MemoryIntroducerClient,
         )
-        anonymous_storage_furl = enabled_config.get_private_config(b"storage.furl")
+        anonymous_storage_furl = enabled_config.get_private_config("storage.furl")
         def check_furl():
             return node.tub.getReferenceForURL(anonymous_storage_furl)
@@ -773 +773 @@
         disabled_config = client.config_from_string(
             basedir,
-            b"tub.port",
+            "tub.port",
             BASECONFIG_I % (SOME_FURL,) + (
-                b"[storage]\n"
-                b"enabled = true\n"
-                b"anonymous = false\n"
+                "[storage]\n"
+                "enabled = true\n"
+                "anonymous = false\n"
             )
         )
@@ -1138 +1138 @@
 
 
-    def get_config(self, storage_enabled, more_storage=b"", more_sections=b""):
-        return b"""
+    def get_config(self, storage_enabled, more_storage="", more_sections=""):
+        return """
 [node]
 tub.location = tcp:192.0.2.0:1234
@@ -1164 +1164 @@
         config = client.config_from_string(
             self.basedir,
-            u"tub.port",
+            "tub.port",
             self.get_config(storage_enabled=False),
         )
@@ -1186 +1186 @@
         config = client.config_from_string(
             self.basedir,
-            u"tub.port",
+            "tub.port",
             self.get_config(storage_enabled=True),
         )
@@ -1218 +1218 @@
         config = client.config_from_string(
             self.basedir,
-            u"tub.port",
+            "tub.port",
             self.get_config(
                 storage_enabled=True,
-                more_storage=b"plugins=tahoe-lafs-dummy-v1",
+                more_storage="plugins=tahoe-lafs-dummy-v1",
                 more_sections=(
-                    b"[storageserver.plugins.tahoe-lafs-dummy-v1]\n"
-                    b"some = {}\n".format(value)
+                    "[storageserver.plugins.tahoe-lafs-dummy-v1]\n"
+                    "some = {}\n".format(value)
                 ),
             ),
@@ -1259 +1259 @@
         config = client.config_from_string(
             self.basedir,
-            u"tub.port",
+            "tub.port",
             self.get_config(
                 storage_enabled=True,
-                more_storage=b"plugins=tahoe-lafs-dummy-v1,tahoe-lafs-dummy-v2",
+                more_storage="plugins=tahoe-lafs-dummy-v1,tahoe-lafs-dummy-v2",
                 more_sections=(
-                    b"[storageserver.plugins.tahoe-lafs-dummy-v1]\n"
-                    b"some = thing-1\n"
-                    b"[storageserver.plugins.tahoe-lafs-dummy-v2]\n"
-                    b"some = thing-2\n"
+                    "[storageserver.plugins.tahoe-lafs-dummy-v1]\n"
+                    "some = thing-1\n"
+                    "[storageserver.plugins.tahoe-lafs-dummy-v2]\n"
+                    "some = thing-2\n"
                 ),
             ),
@@ -1307 +1307 @@
         config = client.config_from_string(
             self.basedir,
-            u"tub.port",
+            "tub.port",
             self.get_config(
                 storage_enabled=True,
-                more_storage=b"plugins=tahoe-lafs-dummy-v1",
+                more_storage="plugins=tahoe-lafs-dummy-v1",
                 more_sections=(
-                    b"[storageserver.plugins.tahoe-lafs-dummy-v1]\n"
-                    b"some = thing\n"
+                    "[storageserver.plugins.tahoe-lafs-dummy-v1]\n"
+                    "some = thing\n"
                 ),
             ),
@@ -1343 +1343 @@
         config = client.config_from_string(
             self.basedir,
-            u"tub.port",
+            "tub.port",
             self.get_config(
                 storage_enabled=True,
-                more_storage=b"plugins=tahoe-lafs-dummy-v1",
+                more_storage="plugins=tahoe-lafs-dummy-v1",
             ),
         )
@@ -1381 +1381 @@
         config = client.config_from_string(
             self.basedir,
-            u"tub.port",
+            "tub.port",
             self.get_config(
                 storage_enabled=True,
-                more_storage=b"plugins=tahoe-lafs-dummy-v1",
+                more_storage="plugins=tahoe-lafs-dummy-v1",
                 more_sections=(
-                    b"[storageserver.plugins.tahoe-lafs-dummy-v1]\n"
+                    "[storageserver.plugins.tahoe-lafs-dummy-v1]\n"
                     # This will make it explode on instantiation.
-                    b"invalid = configuration\n"
+                    "invalid = configuration\n"
                 )
             ),
@@ -1408 +1408 @@
         config = client.config_from_string(
             self.basedir,
-            u"tub.port",
+            "tub.port",
             self.get_config(
                 storage_enabled=True,
-                more_storage=b"plugins=tahoe-lafs-dummy-vX",
+                more_storage="plugins=tahoe-lafs-dummy-vX",
             ),
         )

src/allmydata/test/test_crawler.py ¶

@@ -28 +28 @@
 from allmydata.storage.crawler import ShareCrawler, TimeSliceExceeded
 
-from allmydata.test.common_py3 import FakeCanary
-from allmydata.test.common_util import StallMixin
+from allmydata.test.common_util import StallMixin, FakeCanary
 
 class BucketEnumeratingCrawler(ShareCrawler):

src/allmydata/test/test_deepcheck.py ¶

@@ -1 +1 @@
 import os, json, urllib
 
-# BBB: Python 2 compatibility
+# Python 2 compatibility
 # Can't use `builtins.str` because something deep in Twisted callbacks ends up repr'ing
 # a `future.types.newstr.newstr` as a *Python 3* byte string representation under

src/allmydata/test/test_encodingutil.py ¶

@@ -78 +78 @@
 from twisted.python.filepath import FilePath
 
-from allmydata.test.common_py3 import (
+from allmydata.test.common_util import (
     ReallyEqualMixin, skip_if_cannot_represent_filename,
 )

src/allmydata/test/test_happiness.py ¶

@@ -24 +24 @@
 from allmydata.util.happinessutil import servers_of_happiness, \
     shares_by_server, merge_servers
-from allmydata.test.common_py3 import ShouldFailMixin
+from allmydata.test.common import ShouldFailMixin
 
 

src/allmydata/test/test_iputil.py ¶

@@ -24 +24 @@
 
 from allmydata.util import iputil, gcutil
-import allmydata.test.common_py3 as testutil
+import allmydata.test.common_util as testutil
 from allmydata.util.namespace import Namespace
 

src/allmydata/test/test_node.py ¶

@@ -521 +521 @@
 [i2p]
 enabled = false
-[node]
 """
 
@@ -567 +566 @@
         with open(os.path.join(basedir, "tahoe.cfg"), "w") as f:
             f.write(BASE_CONFIG)
+            f.write("[node]\n")
             f.write("tub.port = tcp:0\n")
             f.write("tub.location = AUTO\n")
@@ -595 +595 @@
         with open(os.path.join(basedir, "tahoe.cfg"), "w") as f:
             f.write(BASE_CONFIG)
+            f.write("[node]\n")
             f.write("tub.port = %s\n" % port)
             f.write("tub.location = %s\n" % location)
@@ -618 +619 @@
         with open(config_fname, "w") as f:
             f.write(BASE_CONFIG)
+            f.write("[node]\n")
             f.write("tub.port = listen:i2p,listen:tor\n")
             f.write("tub.location = tcp:example.org:1234\n")

src/allmydata/test/test_storage.py ¶

@@ -52 +52 @@
     _StorageServer,
 )
-from .common_py3 import FakeCanary, LoggingServiceParent, ShouldFailMixin
+from .common import LoggingServiceParent, ShouldFailMixin
+from .common_util import FakeCanary
 
 

src/allmydata/test/test_storage_web.py ¶

@@ -51 +51 @@
     remove_prefix
 )
-from .common_py3 import FakeCanary
+from .common_util import FakeCanary
 
 def remove_tags(s):

src/allmydata/test/test_time_format.py ¶

@@ -17 +17 @@
 from twisted.trial import unittest
 
-from allmydata.test.common_py3 import TimezoneMixin
+from allmydata.test.common_util import TimezoneMixin
 from allmydata.util import time_format
 

src/allmydata/test/test_upload.py ¶

@@ -29 +29 @@
 from allmydata.util.deferredutil import DeferredListShouldSucceed
 from allmydata.test.no_network import GridTestMixin
-from allmydata.test.common_py3 import ShouldFailMixin
 from allmydata.storage_client import StorageFarmBroker
 from allmydata.storage.server import storage_index_to_dir
@@ -35 +34 @@
 from .common import (
     EMPTY_CLIENT_CONFIG,
+    ShouldFailMixin,
 )
 from functools import reduce

src/allmydata/test/web/test_introducer.py ¶

@@ -34 +34 @@
     SameProcessStreamEndpointAssigner,
 )
-from ..common_py3 import (
+from ..common_util import (
     FakeCanary,
 )

src/allmydata/test/web/test_web.py ¶

@@ -53 +53 @@
 from allmydata.mutable import servermap, publish, retrieve
 from .. import common_util as testutil
-from ..common_py3 import TimezoneMixin
+from ..common_util import TimezoneMixin
 from ..common_web import (
     do_http,

src/allmydata/util/_python3.py ¶

@@ -25 +25 @@
 # Keep these sorted alphabetically, to reduce merge conflicts:
 PORTED_MODULES = [
+    "allmydata._monkeypatch",
     "allmydata.codec",
     "allmydata.crypto",
@@ -41 +42 @@
     "allmydata.immutable.downloader.share",
     "allmydata.immutable.downloader.status",
+    "allmydata.immutable.encode",
+    "allmydata.immutable.filenode",
     "allmydata.immutable.happiness_upload",
+    "allmydata.immutable.layout",
     "allmydata.immutable.literal",
+    "allmydata.immutable.upload",
     "allmydata.interfaces",
     "allmydata.introducer.interfaces",
@@ -54 +59 @@
     "allmydata.storage.server",
     "allmydata.storage.shares",
-    "allmydata.test.common_py3",
     "allmydata.test.no_network",
     "allmydata.uri",