dulwich-users team mailing list archive

[Jelmer Vernooij <jelmer@xxxxxxxxxxx>]

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.

Cheers,

Jelmer

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: jelmer@xxxxxxxxx-20110313165039-iuvgtt4qx9fxjzg6
# target_branch: file:///home/jelmer/src/dulwich/trunk/
# testament_sha1: 8c89d0c61dbd4212604c272c8f80c417e553a446
# timestamp: 2011-03-13 17:52:01 +0100
# base_revision_id: git-v1:8a2f5cefc0322bc1396c7d7d265e3af7dbf23378
# 
# Begin patch
=== modified file 'NEWS'
--- NEWS	2011-03-06 03:48:23 +0000
+++ NEWS	2011-03-13 16:50:39 +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:50:39 +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:50:39 +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:50:39 +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:50:39 +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)

# Begin bundle
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
olUSikcw1YAwU6i8glD/xdyRThQkL7O+OoA=

Attachment: signature.asc
Description: Digital signature