Merge branch '3618.bb-tests-python-3' into 3624.web-python-3-part-5

src/allmydata/check_results.py

@@ -1,3 +1,14 @@
+"""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 past.builtins import unicode
 
 from zope.interface import implementer

src/allmydata/mutable/servermap.py

@@ -1212,7 +1212,7 @@ class ServermapUpdater(object):
                 break
             more_queries.append(self.extra_servers.pop(0))
 
-        self.log(format="sending %(more)d more queries: %(who)d",
+        self.log(format="sending %(more)d more queries: %(who)s",
                  more=len(more_queries),
                  who=" ".join(["[%r]" % s.get_name() for s in more_queries]),
                  level=log.NOISY)

src/allmydata/util/_python3.py

@@ -28,6 +28,7 @@ PORTED_MODULES = [
     "allmydata._auto_deps",
     "allmydata._monkeypatch",
     "allmydata.blacklist",
+    "allmydata.check_results",
     "allmydata.codec",
     "allmydata.control",
     "allmydata.crypto",

tox.ini

@@ -44,7 +44,7 @@ deps =
 # more useful results.
 usedevelop = False
 # We use extras=test to get things like "mock" that are required for our unit
-# tests.8
+# tests.
 extras = test
 
 setenv =