ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2025-06-23 01:08:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

More passing tests on Python 3.

Browse Source
This commit is contained in:
Itamar Turner-Trauring
2020-12-09 13:50:15 -05:00
parent 6b8fd2f29d
commit 016240d6e6
2 changed files with 25 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/allmydata/dirnode.py
View File

@ -468,7 +468,7 @@ class DirectoryNode(object):
exists a child of the given name, False if not."""
name = normalize(namex)
d = self._read()
d.addCallback(lambda children: children.has_key(name))
d.addCallback(lambda children: name in children)
return d
def _get(self, children, name):
@ -569,7 +569,7 @@ class DirectoryNode(object):
# this takes URIs
a = Adder(self, overwrite=overwrite,
create_readonly_node=self._create_readonly_node)
for (namex, e) in entries.iteritems():
for (namex, e) in entries.items():
assert isinstance(namex, unicode), namex
if len(e) == 2:
writecap, readcap = e
@ -779,7 +779,7 @@ class DirectoryNode(object):
# in the nodecache) seem to consume about 2000 bytes.
dirkids = []
filekids = []
for name, (child, metadata) in sorted(children.iteritems()):
for name, (child, metadata) in sorted(children.items()):
childpath = path + [name]
if isinstance(child, UnknownNode):
walker.add_node(child, childpath)