Changeset 48bef7d in trunk

Timestamp:

2020-12-09T18:42:35Z (5 years ago)

Author:

Itamar Turner-Trauring <itamar@…>

Branches:

master

Children:

6b8fd2f

Parents:

489b3692

Message:

Some straightforward changes to support Python 3.

File:

• src/allmydata/dirnode.py (modified) (9 diffs)

src/allmydata/dirnode.py ¶

@@ -180 +180 @@
         children = self.node._unpack_contents(old_contents)
         now = time.time()
-        for (namex, (child, new_metadata)) in self.entries.iteritems():
+        for (namex, (child, new_metadata)) in list(self.entries.items()):
             name = normalize(namex)
             precondition(IFilesystemNode.providedBy(child), child)
@@ -206 +206 @@
 
 def _encrypt_rw_uri(writekey, rw_uri):
-    precondition(isinstance(rw_uri, str), rw_uri)
-    precondition(isinstance(writekey, str), writekey)
+    precondition(isinstance(rw_uri, bytes), rw_uri)
+    precondition(isinstance(writekey, bytes), writekey)
 
     salt = hashutil.mutable_rwcap_salt_hash(rw_uri)
@@ -222 +222 @@
     # initial_children must have metadata (i.e. {} instead of None)
     children = {}
-    for (namex, (node, metadata)) in childrenx.iteritems():
+    for (namex, (node, metadata)) in list(childrenx.items()):
         precondition(isinstance(metadata, dict),
                      "directory creation requires metadata to be a dict, not None", metadata)
@@ -246 +246 @@
     immutable, and will raise a MustBeDeepImmutableError if not.
     """
-    precondition((writekey is None) or isinstance(writekey, str), writekey)
+    precondition((writekey is None) or isinstance(writekey, bytes), writekey)
 
     has_aux = isinstance(children, AuxValueDict)
@@ -265 +265 @@
             rw_uri = child.get_write_uri()
             if rw_uri is None:
-                rw_uri = ""
-            assert isinstance(rw_uri, str), rw_uri
+                rw_uri = b""
+            assert isinstance(rw_uri, bytes), rw_uri
 
             # should be prevented by MustBeDeepImmutableError check above
@@ -273 +273 @@
             ro_uri = child.get_readonly_uri()
             if ro_uri is None:
-                ro_uri = ""
-            assert isinstance(ro_uri, str), ro_uri
+                ro_uri = b""
+            assert isinstance(ro_uri, bytes), ro_uri
             if writekey is not None:
                 writecap = netstring(_encrypt_rw_uri(writekey, rw_uri))
             else:
                 writecap = ZERO_LEN_NETSTR
-            entry = "".join([netstring(name.encode("utf-8")),
+            entry = b"".join([netstring(name.encode("utf-8")),
                              netstring(strip_prefix_for_ro(ro_uri, deep_immutable)),
                              writecap,
-                             netstring(json.dumps(metadata))])
+                             netstring(json.dumps(metadata).encode("utf-8"))])
         entries.append(netstring(entry))
-    return "".join(entries)
+    return b"".join(entries)
 
 @implementer(IDirectoryNode, ICheckable, IDeepCheckable)
@@ -353 +353 @@
         # The rwcapdata is formatted as:
         # pack("16ss32s", iv, AES(H(writekey+iv), plaintext_rw_uri), mac)
-        assert isinstance(data, str), (repr(data), type(data))
+        assert isinstance(data, bytes), (repr(data), type(data))
         # an empty directory is serialized as an empty string
         if data == "":
@@ -556 +556 @@
 
     def set_uri(self, namex, writecap, readcap, metadata=None, overwrite=True):
-        precondition(isinstance(writecap, (str,type(None))), writecap)
-        precondition(isinstance(readcap, (str,type(None))), readcap)
+        precondition(isinstance(writecap, (bytes, type(None))), writecap)
+        precondition(isinstance(readcap, (bytes, type(None))), readcap)
 
         # We now allow packing unknown nodes, provided they are valid
@@ -578 +578 @@
                 assert len(e) == 3
                 writecap, readcap, metadata = e
-            precondition(isinstance(writecap, (str,type(None))), writecap)
-            precondition(isinstance(readcap, (str,type(None))), readcap)
+            precondition(isinstance(writecap, (bytes,type(None))), writecap)
+            precondition(isinstance(readcap, (bytes,type(None))), readcap)
 
             # We now allow packing unknown nodes, provided they are valid