Bläddra i källkod

object_store: Fix return type of MemoryObjectStore.get_raw.

Change-Id: I00481699ef71559b44976a17b564b5cba1f6c3e1
Dave Borowitz 13 år sedan
förälder
incheckning
d0eaad5a34
3 ändrade filer med 9 tillägg och 1 borttagningar
  1. 2 0
      NEWS
  2. 2 1
      dulwich/object_store.py
  3. 5 0
      dulwich/tests/test_object_store.py

+ 2 - 0
NEWS

@@ -15,6 +15,8 @@
 
   * Prevent raising ValueError for correct refs in RefContainer.__delitem__.
 
+  * Correctly return a tuple from MemoryObjectStore.get_raw. (Dave Borowitz)
+
  API CHANGES
 
   * write_pack no longer takes the num_objects argument and requires an object

+ 2 - 1
dulwich/object_store.py

@@ -540,7 +540,8 @@ class MemoryObjectStore(BaseObjectStore):
         :param name: sha for the object.
         :return: tuple with numeric type and object contents.
         """
-        return self[name].as_raw_string()
+        obj = self[name]
+        return obj.type_num, obj.as_raw_string()
 
     def __getitem__(self, name):
         return self._data[name]

+ 5 - 0
dulwich/tests/test_object_store.py

@@ -178,6 +178,11 @@ class ObjectStoreTests(object):
         for obj in [testobject, tag1, tag2, tag3]:
             self.assertEqual(testobject, self.store.peel_sha(obj.id))
 
+    def test_get_raw(self):
+        self.store.add_object(testobject)
+        self.assertEqual((Blob.type_num, 'yummy data'),
+                         self.store.get_raw(testobject.id))
+
 
 class MemoryObjectStoreTests(ObjectStoreTests, TestCase):