Changeset f60c703 in trunk

Timestamp:

2020-11-12T16:24:37Z (5 years ago)

Author:

Itamar Turner-Trauring <itamar@…>

Branches:

master

Children:

a0845d8

Parents:

99f5422

Message:

Ported to Python 3.

Location:

src/allmydata

Files:

• mutable/servermap.py (modified) (9 diffs)
• util/_python3.py (modified) (1 diff)

src/allmydata/mutable/servermap.py ¶

@@ +1 @@
+"""
+Ported to Python 3.
+"""
 from __future__ import print_function
-
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import unicode_literals
+
+from future.utils import PY2
+if PY2:
+    # Doesn't import str to prevent API leakage on Python 2
+    from future.builtins import filter, map, zip, ascii, chr, hex, input, next, oct, open, pow, round, super, bytes, dict, list, object, range, max, min  # noqa: F401
 from past.builtins import unicode
 
@@ -189 +199 @@
         print("servermap:", file=out)
 
-        for ( (server, shnum), (verinfo, timestamp) ) in self._known_shares.items():
+        for ( (server, shnum), (verinfo, timestamp) ) in list(self._known_shares.items()):
             (seqnum, root_hash, IV, segsize, datalength, k, N, prefix,
              offsets_tuple) = verinfo
@@ -227 +237 @@
         timestamp) tuples."""
         versionmap = DictOfSets()
-        for ( (server, shnum), (verinfo, timestamp) ) in self._known_shares.items():
+        for ( (server, shnum), (verinfo, timestamp) ) in list(self._known_shares.items()):
             versionmap.add(verinfo, (shnum, server, timestamp))
         return versionmap
@@ -246 +256 @@
         versionmap = self.make_versionmap()
         all_shares = {}
-        for verinfo, shares in versionmap.items():
+        for verinfo, shares in list(versionmap.items()):
             s = set()
             for (shnum, server, timestamp) in shares:
@@ -272 +282 @@
         versionmap = self.make_versionmap()
         bits = []
-        for (verinfo, shares) in versionmap.items():
+        for (verinfo, shares) in list(versionmap.items()):
             vstr = self.summarize_version(verinfo)
             shnums = set([shnum for (shnum, server, timestamp) in shares])
@@ -283 +293 @@
         versionmap = self.make_versionmap()
         recoverable_versions = set()
-        for (verinfo, shares) in versionmap.items():
+        for (verinfo, shares) in list(versionmap.items()):
             (seqnum, root_hash, IV, segsize, datalength, k, N, prefix,
              offsets_tuple) = verinfo
@@ -299 +309 @@
 
         unrecoverable_versions = set()
-        for (verinfo, shares) in versionmap.items():
+        for (verinfo, shares) in list(versionmap.items()):
             (seqnum, root_hash, IV, segsize, datalength, k, N, prefix,
              offsets_tuple) = verinfo
@@ -333 +343 @@
         unrecoverable = set()
         highest_recoverable_seqnum = -1
-        for (verinfo, shares) in versionmap.items():
+        for (verinfo, shares) in list(versionmap.items()):
             (seqnum, root_hash, IV, segsize, datalength, k, N, prefix,
              offsets_tuple) = verinfo
@@ -668 +678 @@
         ds = []
 
-        for shnum,datav in datavs.items():
+        for shnum,datav in list(datavs.items()):
             data = datav[0]
             reader = MDMFSlotReadProxy(ss,

src/allmydata/util/_python3.py ¶

@@ -61 +61 @@
     "allmydata.mutable.repairer",
     "allmydata.mutable.retrieve",
+    "allmydata.mutable.servermap",
     "allmydata.node",
     "allmydata.storage_client",