Deprecate Tree.entries.

diff --git a/NEWS b/NEWS
index 67d352635287a1cdc9111c482996ada5eb1ec4a7..9a197a8621a3e76da80b619c12961cc4b75d35d6 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -16,6 +16,11 @@
 
   * Sphinxified documentation. (Lukasz Balcerzak)
 
+ API CHANGES
+
+  * Tree.entries() is now deprecated in favour of Tree.items() and
+    Tree.iteritems(). (Jelmer Vernooij)
+
 0.7.0  2011-01-21
 
  FEATURES

diff --git a/dulwich/object_store.py b/dulwich/object_store.py
index a10fc08c107c444e4c3a147e254e545c6ed2140c..fdc0a654cdb9a5f3933d2d0c5f0391cd49562c8d 100644 (file)
--- a/dulwich/object_store.py
+++ b/dulwich/object_store.py
@@ -698,7 +698,7 @@ class MissingObjectFinder(object):
 
     def parse_tree(self, tree):
         self.add_todo([(sha, name, not stat.S_ISDIR(mode))
-                       for mode, name, sha in tree.entries()
+                       for name, mode, sha in tree.iteritems()
                        if not S_ISGITLINK(mode)])
 
     def parse_commit(self, commit):

diff --git a/dulwich/objects.py b/dulwich/objects.py
index 580cb633a8efdde0daed0f10f3d0e9fb44a886cf..c3282877c40d2ae927c5a12b59907372fecb6d2f 100644 (file)
--- a/dulwich/objects.py
+++ b/dulwich/objects.py
@@ -838,6 +838,9 @@ class Tree(ShaFile):
             returned by the items and iteritems methods. This function will be
             deprecated in the future.
         """
+        warnings.warn("Tree.entries() is deprecated. Use Tree.items() or"
+            " Tree.iteritems() instead.", category=DeprecationWarning,
+            stacklevel=2)
         self._ensure_parsed()
         # The order of this is different from iteritems() for historical
         # reasons

diff --git a/dulwich/tests/test_objects.py b/dulwich/tests/test_objects.py
index be4f4ea363397eb3817616a4467e368502bd99de..cb066edd21d6af4974fdadca338029fe9f810f2b 100644 (file)
--- a/dulwich/tests/test_objects.py
+++ b/dulwich/tests/test_objects.py
@@ -150,8 +150,8 @@ class BlobReadTests(TestCase):
 
     def test_read_tree_from_file(self):
         t = self.get_tree(tree_sha)
-        self.assertEqual(t.entries()[0], (33188, 'a', a_sha))
-        self.assertEqual(t.entries()[1], (33188, 'b', b_sha))
+        self.assertEqual(t.items()[0], ('a', 33188, a_sha))
+        self.assertEqual(t.items()[1], ('b', 33188, b_sha))
 
     def test_read_tag_from_file(self):
         t = self.get_tag(tag_sha)

diff --git a/dulwich/tests/test_repository.py b/dulwich/tests/test_repository.py
index 7b2a6939195f5feb3545c636414313781ac2f50b..f580d6c360b557d27586efe236fa253a28df044b 100644 (file)
--- a/dulwich/tests/test_repository.py
+++ b/dulwich/tests/test_repository.py
@@ -239,7 +239,7 @@ class RepositoryTests(TestCase):
         r = self._repo = open_repo('a.git')
         commit = r[r.head()]
         tree = r[commit.tree]
-        blob_sha = tree.entries()[0][2]
+        blob_sha = tree.items()[0][2]
         warnings.simplefilter("ignore", DeprecationWarning)
         try:
             blob = r.get_blob(blob_sha)