From: Brian Warner <warner@allmydata.com>
Date: Fri, 3 Oct 2008 01:08:45 +0000 (-0700)
Subject: dirnode: fix my remarkably-consistent 'metdadata' typo
X-Git-Url: https://git.rkrishnan.org/somewhere?a=commitdiff_plain;h=09341a969aafb0dabcd534670ab0a9f37b127dba;p=tahoe-lafs%2Ftahoe-lafs.git

dirnode: fix my remarkably-consistent 'metdadata' typo
---

diff --git a/src/allmydata/dirnode.py b/src/allmydata/dirnode.py
index c1250479..a69e9996 100644
--- a/src/allmydata/dirnode.py
+++ b/src/allmydata/dirnode.py
@@ -297,11 +297,11 @@ class NewDirectoryNode:
         The path can be either a single string (slash-separated) or a list of
         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)
         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
         a metadata dictionary from the last edge that was traversed.
         """
@@ -319,7 +319,7 @@ class NewDirectoryNode:
         if remaining_path:
             d = self.get(childname)
             d.addCallback(lambda node:
-                          node.get_child_and_metdadata_at_path(remaining_path))
+                          node.get_child_and_metadata_at_path(remaining_path))
             return d
         d = self.get_child_and_metadata(childname)
         return d
diff --git a/src/allmydata/test/test_dirnode.py b/src/allmydata/test/test_dirnode.py
index 19667228..4858b963 100644
--- a/src/allmydata/test/test_dirnode.py
+++ b/src/allmydata/test/test_dirnode.py
@@ -381,10 +381,10 @@ class Dirnode(unittest.TestCase, testutil.ShouldFailMixin, testutil.StallMixin):
             d.addCallback(lambda res:
                           self.shouldFail(KeyError, "gcamap-no",
                                           "'nope'",
-                                          n.get_child_and_metdadata_at_path,
+                                          n.get_child_and_metadata_at_path,
                                           u"subdir/nope"))
             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):
                 child, metadata = res
                 self.failUnless(isinstance(child, FakeDirectoryNode))
@@ -392,7 +392,7 @@ class Dirnode(unittest.TestCase, testutil.ShouldFailMixin, testutil.StallMixin):
                 self.failUnlessEqual(sorted(metadata.keys()), [])
             d.addCallback(_check_child_and_metadata1)
             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):
                 child, metadata = res
@@ -403,7 +403,7 @@ class Dirnode(unittest.TestCase, testutil.ShouldFailMixin, testutil.StallMixin):
             d.addCallback(_check_child_and_metadata2)
 
             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):
                 child, metadata = res
                 self.failUnless(isinstance(child, FakeDirectoryNode))