Merge deprecation of Tree.entries.

NEWS

@@ -22,6 +22,9 @@
     is now consistent with the rest of Dulwich. Existing code will still
     work but print a DeprecationWarning. (Jelmer Vernooij, #663550)
 
+  * Tree.entries() is now deprecated in favour of Tree.items() and
+    Tree.iteritems(). (Jelmer Vernooij)
+
 0.7.0	2011-01-21
 
  FEATURES

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):

dulwich/objects.py

@@ -843,6 +843,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

dulwich/tests/test_objects.py

@@ -151,8 +151,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)

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)