Merge lp:~jelmer/dulwich/deprecate-tree-entries into lp:~vcs-imports/dulwich/trunk

[Jelmer Vernooij]

Deprecated Tree.entries(), which returns entries in an unusual format
(mode, name, hexsha). Tree.iteritems() / Tree.items() should be used
instead and have been available for some time.

=== modified file 'NEWS'
--- NEWS	2011-03-06 03:48:23 +0000
+++ NEWS	2011-03-13 16:57:53 +0000
@@ -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

=== modified file 'dulwich/object_store.py'
--- dulwich/object_store.py	2011-03-06 03:48:23 +0000
+++ dulwich/object_store.py	2011-03-13 16:57:53 +0000
@@ -698,7 +698,7 @@
 
     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):

=== modified file 'dulwich/objects.py'
--- dulwich/objects.py	2011-03-06 03:48:23 +0000
+++ dulwich/objects.py	2011-03-13 16:57:53 +0000
@@ -838,6 +838,9 @@
             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

=== modified file 'dulwich/tests/test_objects.py'
--- dulwich/tests/test_objects.py	2010-12-19 15:56:03 +0000
+++ dulwich/tests/test_objects.py	2011-03-13 16:57:53 +0000
@@ -150,8 +150,8 @@
 
     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)

=== modified file 'dulwich/tests/test_repository.py'
--- dulwich/tests/test_repository.py	2011-01-17 06:00:40 +0000
+++ dulwich/tests/test_repository.py	2011-03-13 16:57:53 +0000
@@ -239,7 +239,7 @@
         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)