tahoe-lafs/tahoe-lafs
tahoe-lafs
/
tahoe-lafs
2
0
Fork 0
Code Issues Pull Requests 23 Packages Projects Releases 1 Wiki Activity

dirnode: fix my remarkably-consistent 'metdadata' typo

This commit is contained in:
Brian Warner 2008-10-02 18:08:45 -07:00
parent 41bacca3f1
commit 09341a969a
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/allmydata/dirnode.py
View File

@ -297,11 +297,11 @@ class NewDirectoryNode:
The path can be either a single string (slash-separated) or a list of The path can be either a single string (slash-separated) or a list of
path-name elements. path-name elements.
""" """
d = self.get_child_and_metdadata_at_path(path) d = self.get_child_and_metadata_at_path(path)
d.addCallback(lambda (node, metadata): node) d.addCallback(lambda (node, metadata): node)
return d return d
def get_child_and_metdadata_at_path(self, path): def get_child_and_metadata_at_path(self, path):
"""Transform a child path into an IDirectoryNode or IFileNode and """Transform a child path into an IDirectoryNode or IFileNode and
a metadata dictionary from the last edge that was traversed. a metadata dictionary from the last edge that was traversed.
""" """
@ -319,7 +319,7 @@ class NewDirectoryNode:
if remaining_path: if remaining_path:
d = self.get(childname) d = self.get(childname)
d.addCallback(lambda node: d.addCallback(lambda node:
node.get_child_and_metdadata_at_path(remaining_path)) node.get_child_and_metadata_at_path(remaining_path))
return d return d
d = self.get_child_and_metadata(childname) d = self.get_child_and_metadata(childname)
return d return d

8
src/allmydata/test/test_dirnode.py
View File

@ -381,10 +381,10 @@ class Dirnode(unittest.TestCase, testutil.ShouldFailMixin, testutil.StallMixin):
d.addCallback(lambda res: d.addCallback(lambda res:
self.shouldFail(KeyError, "gcamap-no", self.shouldFail(KeyError, "gcamap-no",
"'nope'", "'nope'",
n.get_child_and_metdadata_at_path, n.get_child_and_metadata_at_path,
u"subdir/nope")) u"subdir/nope"))
d.addCallback(lambda res: d.addCallback(lambda res:
n.get_child_and_metdadata_at_path(u"")) n.get_child_and_metadata_at_path(u""))
def _check_child_and_metadata1(res): def _check_child_and_metadata1(res):
child, metadata = res child, metadata = res
self.failUnless(isinstance(child, FakeDirectoryNode)) self.failUnless(isinstance(child, FakeDirectoryNode))
@ -392,7 +392,7 @@ class Dirnode(unittest.TestCase, testutil.ShouldFailMixin, testutil.StallMixin):
self.failUnlessEqual(sorted(metadata.keys()), []) self.failUnlessEqual(sorted(metadata.keys()), [])
d.addCallback(_check_child_and_metadata1) d.addCallback(_check_child_and_metadata1)
d.addCallback(lambda res: d.addCallback(lambda res:
n.get_child_and_metdadata_at_path(u"child")) n.get_child_and_metadata_at_path(u"child"))
def _check_child_and_metadata2(res): def _check_child_and_metadata2(res):
child, metadata = res child, metadata = res
@ -403,7 +403,7 @@ class Dirnode(unittest.TestCase, testutil.ShouldFailMixin, testutil.StallMixin):
d.addCallback(_check_child_and_metadata2) d.addCallback(_check_child_and_metadata2)
d.addCallback(lambda res: d.addCallback(lambda res:
n.get_child_and_metdadata_at_path(u"subdir/subsubdir")) n.get_child_and_metadata_at_path(u"subdir/subsubdir"))
def _check_child_and_metadata3(res): def _check_child_and_metadata3(res):
child, metadata = res child, metadata = res
self.failUnless(isinstance(child, FakeDirectoryNode)) self.failUnless(isinstance(child, FakeDirectoryNode))