Changeset 96fd186 in trunk

Timestamp:

2020-12-09T19:58:54Z (5 years ago)

Author:

Itamar Turner-Trauring <itamar@…>

Branches:

master

Children:

66cd68d, 995f271

Parents:

ba42483

Message:

Port to Python 3.

Location:

src/allmydata

Files:

• dirnode.py (modified) (2 diffs)
• nodemaker.py (modified) (1 diff)
• test/test_dirnode.py (modified) (2 diffs)
• util/_python3.py (modified) (1 diff)

src/allmydata/dirnode.py ¶

@@ -10 +10 @@
 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
+    # Skip dict so it doesn't break things.
+    from future.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 past.builtins import unicode
 
@@ -269 +270 @@
         child.raise_error()
         if deep_immutable and not child.is_allowed_in_immutable_directory():
-            raise MustBeDeepImmutableError("child %s is not allowed in an immutable directory" %
-                                           quote_output(name, encoding='utf-8'), name)
+            raise MustBeDeepImmutableError(
+                "child %r is not allowed in an immutable directory" % (name,),
+                name)
         if has_aux:
             entry = children.get_aux(name)

src/allmydata/nodemaker.py ¶

@@ +1 @@
+"""
+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
+
 import weakref
 from zope.interface import implementer

src/allmydata/test/test_dirnode.py ¶

@@ -15 +15 @@
     from future.builtins import filter, map, zip, ascii, chr, hex, input, next, oct, open, pow, round, super, bytes, dict, object, range, str, max, min  # noqa: F401
 
-import six
 import time
 import unicodedata
@@ -46 +45 @@
 from hypothesis import given
 from hypothesis.strategies import text
-
-if six.PY3:
-    long = int
 
 

src/allmydata/util/_python3.py ¶

@@ -67 +67 @@
     "allmydata.mutable.servermap",
     "allmydata.node",
+    "allmydata.nodemaker",
     "allmydata.storage_client",
     "allmydata.storage.common",