Merge pull request #764 from tahoe-lafs/3370.happiness-upload-python-3

Port happiness_upload to Python 3

misc/python3/ratchet-passing

@@ -57,6 +57,21 @@ allmydata.test.test_deferredutil.DeferredUtilTests.test_success
 allmydata.test.test_deferredutil.DeferredUtilTests.test_wait_for_delayed_calls
 allmydata.test.test_dictutil.DictUtil.test_auxdict
 allmydata.test.test_dictutil.DictUtil.test_dict_of_sets
+allmydata.test.test_happiness.Happiness.test_100
+allmydata.test.test_happiness.Happiness.test_calc_happy
+allmydata.test.test_happiness.Happiness.test_everything_broken
+allmydata.test.test_happiness.Happiness.test_hypothesis0
+allmydata.test.test_happiness.Happiness.test_hypothesis_0
+allmydata.test.test_happiness.Happiness.test_hypothesis_1
+allmydata.test.test_happiness.Happiness.test_placement_1
+allmydata.test.test_happiness.Happiness.test_placement_simple
+allmydata.test.test_happiness.Happiness.test_redistribute
+allmydata.test.test_happiness.Happiness.test_unhappy
+allmydata.test.test_happiness.HappinessUtils.test_residual_0
+allmydata.test.test_happiness.HappinessUtils.test_trivial_flow_graph
+allmydata.test.test_happiness.HappinessUtils.test_trivial_maximum_graph
+allmydata.test.test_happiness.PlacementTests.test_hypothesis_unhappy
+allmydata.test.test_happiness.PlacementTests.test_more_hypothesis
 allmydata.test.test_hashtree.Complete.test_create
 allmydata.test.test_hashtree.Complete.test_dump
 allmydata.test.test_hashtree.Complete.test_needed_hashes

src/allmydata/immutable/happiness_upload.py

@@ -1,5 +1,20 @@
+"""
+Algorithms for figuring out happiness, the number of unique nodes the data is
+on.
 
-from Queue import PriorityQueue
+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:
+    # We omit dict, just in case newdict breaks things for external Python 2 code.
+    from builtins import filter, map, zip, ascii, chr, hex, input, next, oct, open, pow, round, super, bytes, list, object, range, str, max, min  # noqa: F401
+
+from queue import PriorityQueue
 
 
 def augmenting_path_for(graph):
@@ -35,9 +50,9 @@ def bfs(graph, s):
     GRAY  = 1
     # BLACK vertices are those we have seen and explored
     BLACK = 2
-    color        = [WHITE for i in xrange(len(graph))]
-    predecessor  = [None for i in xrange(len(graph))]
-    distance     = [-1 for i in xrange(len(graph))]
+    color        = [WHITE for i in range(len(graph))]
+    predecessor  = [None for i in range(len(graph))]
+    distance     = [-1 for i in range(len(graph))]
     queue = [s] # vertices that we haven't explored yet.
     color[s] = GRAY
     distance[s] = 0
@@ -58,9 +73,9 @@ def residual_network(graph, f):
     flow network represented by my graph and f arguments. graph is a
     flow network in adjacency-list form, and f is a flow in graph.
     """
-    new_graph = [[] for i in xrange(len(graph))]
-    cf = [[0 for s in xrange(len(graph))] for sh in xrange(len(graph))]
-    for i in xrange(len(graph)):
+    new_graph = [[] for i in range(len(graph))]
+    cf = [[0 for s in range(len(graph))] for sh in range(len(graph))]
+    for i in range(len(graph)):
         for v in graph[i]:
             if f[i][v] == 1:
                 # We add an edge (v, i) with cf[v,i] = 1. This means
@@ -135,7 +150,7 @@ def _compute_maximum_graph(graph, shareIndices):
         return {}
 
     dim = len(graph)
-    flow_function = [[0 for sh in xrange(dim)] for s in xrange(dim)]
+    flow_function = [[0 for sh in range(dim)] for s in range(dim)]
     residual_graph, residual_function = residual_network(graph, flow_function)
 
     while augmenting_path_for(residual_graph):
@@ -260,9 +275,9 @@ def _servermap_flow_graph(peers, shares, servermap):
     #print "share_to_index %s" % share_to_index
     #print "servermap %s" % servermap
     for peer in peers:
-        if servermap.has_key(peer):
+        if peer in servermap:
             for s in servermap[peer]:
-                if share_to_index.has_key(s):
+                if s in share_to_index:
                     indexedShares.append(share_to_index[s])
         graph.insert(peer_to_index[peer], indexedShares)
     for share in shares:
@@ -373,7 +388,7 @@ def share_placement(peers, readonly_peers, shares, peers_to_shares):
     new_mappings = _calculate_mappings(new_peers, new_shares)
     #print "new_peers %s" % new_peers
     #print "new_mappings %s" % new_mappings
-    mappings = dict(readonly_mappings.items() + existing_mappings.items() + new_mappings.items())
+    mappings = dict(list(readonly_mappings.items()) + list(existing_mappings.items()) + list(new_mappings.items()))
     homeless_shares = set()
     for share in mappings:
         if mappings[share] is None:
@@ -384,7 +399,7 @@ def share_placement(peers, readonly_peers, shares, peers_to_shares):
             mappings, homeless_shares,
             {
                 k: v
-                for k, v in peers_to_shares.items()
+                for k, v in list(peers_to_shares.items())
                 if k not in readonly_peers
             }
         )
@@ -401,5 +416,5 @@ def share_placement(peers, readonly_peers, shares, peers_to_shares):
 
     return {
         k: v.pop() if v else next(peer_iter)
-        for k, v in mappings.items()
+        for k, v in list(mappings.items())
     }

src/allmydata/test/test_happiness.py

@@ -1,5 +1,15 @@
 # -*- coding: utf-8 -*-
 
+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:
+    # We omit dict, just in case newdict breaks things.
+    from builtins import filter, map, zip, ascii, chr, hex, input, next, oct, open, pow, round, super, bytes, list, object, range, str, max, min  # noqa: F401
+
 from twisted.trial import unittest
 from hypothesis import given
 from hypothesis.strategies import text, sets

src/allmydata/util/_python3.py

@@ -22,6 +22,7 @@ PORTED_MODULES = [
     "allmydata.crypto.rsa",
     "allmydata.crypto.util",
     "allmydata.hashtree",
+    "allmydata.immutable.happiness_upload",
     "allmydata.test.common_py3",
     "allmydata.util._python3",
     "allmydata.util.abbreviate",
@@ -53,6 +54,7 @@ PORTED_TEST_MODULES = [
     "allmydata.test.test_crypto",
     "allmydata.test.test_deferredutil",
     "allmydata.test.test_dictutil",
+    "allmydata.test.test_happiness",
     "allmydata.test.test_hashtree",
     "allmydata.test.test_hashutil",
     "allmydata.test.test_humanreadable",