Merge branch 'master' into 3496.mutable-tests-python-3-part-3

src/allmydata/mutable/checker.py

@@ -187,7 +187,7 @@ class MutableChecker(object):
         if self.bad_shares:
             report.append("Corrupt Shares:")
             summary.append("Corrupt Shares:")
-        for (server, shnum, f) in self.bad_shares:
+        for (server, shnum, f) in sorted(self.bad_shares, key=id):
             serverid = server.get_serverid()
             locator = (server, self._storage_index, shnum)
             corrupt_share_locators.append(locator)

src/allmydata/test/no_network.py

@@ -20,7 +20,7 @@ from __future__ import unicode_literals
 # Tubs, so it is not useful for tests that involve a Helper or the
 # control.furl .
 
-from future.utils import PY2, PY3
+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
@@ -294,10 +294,6 @@ class _NoNetworkClient(_Client):
         pass
     #._servers will be set by the NoNetworkGrid which creates us
 
-    if PY3:
-        def init_web(self, *args, **kwargs):
-            print("Web service is temporarily disabled until nevow is gone.")
-
 
 class SimpleStats(object):
     def __init__(self):
@@ -504,12 +500,10 @@ class GridTestMixin(object):
 
     def _record_webports_and_baseurls(self):
         self.g._check_clients()
-        if PY2:
-            # Temporarily disabled on Python 3 until Nevow is gone:
-            self.client_webports = [c.getServiceNamed("webish").getPortnum()
-                                    for c in self.g.clients]
-            self.client_baseurls = [c.getServiceNamed("webish").getURL()
-                                    for c in self.g.clients]
+        self.client_webports = [c.getServiceNamed("webish").getPortnum()
+                                for c in self.g.clients]
+        self.client_baseurls = [c.getServiceNamed("webish").getURL()
+                                for c in self.g.clients]
 
     def get_client_config(self, i=0):
         self.g._check_clients()