Changeset 9e2a79ee in trunk

Timestamp:

2020-11-11T19:45:20Z (5 years ago)

Author:

Itamar Turner-Trauring <itamar@…>

Branches:

master

Children:

252f35a2, dc611bf

Parents:

d0d7a827

Message:

Ported to Python 3.

Location:

src/allmydata

Files:

• mutable/publish.py (modified) (3 diffs)
• util/_python3.py (modified) (1 diff)

src/allmydata/mutable/publish.py ¶

@@ +1 @@
+"""
+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 os, time
 from io import BytesIO
@@ -447 +459 @@
         # then we add in all the shares that were bad (corrupted, bad
         # signatures, etc). We want to replace these.
-        for key, old_checkstring in self._servermap.get_bad_shares().items():
+        for key, old_checkstring in list(self._servermap.get_bad_shares().items()):
             (server, shnum) = key
             self.goal.add( (server,shnum) )
@@ -1106 +1118 @@
             # use the checkstring to add information to the log message
             unknown_format = False
-            for (shnum,readv) in read_data.items():
+            for (shnum,readv) in list(read_data.items()):
                 checkstring = readv[0]
                 version = get_version_from_checkstring(checkstring)

src/allmydata/util/_python3.py ¶

@@ -57 +57 @@
     "allmydata.mutable.common",
     "allmydata.mutable.filenode",
+    "allmydata.mutable.publish",
     "allmydata.node",
     "allmydata.storage_client",