浏览代码

Fix test.

Jelmer Vernooij 7 年之前
父节点
当前提交
2935e1e5bb
共有 3 个文件被更改,包括 3 次插入3 次删除
  1. 1 2
      dulwich/client.py
  2. 1 0
      dulwich/object_store.py
  3. 1 1
      dulwich/tests/test_object_store.py

+ 1 - 2
dulwich/client.py

@@ -38,7 +38,6 @@ Known capabilities that are not supported:
  * include-tag
 """
 
-from StringIO import StringIO
 from contextlib import closing
 from io import BytesIO, BufferedReader
 import gzip
@@ -1256,7 +1255,7 @@ class HttpGitClient(GitClient):
                 raise GitProtocolError("unexpected http response %d for %s" %
                                        (e.code, url))
         if resp.info().get('Content-Encoding') == 'gzip':
-            read = gzip.GzipFile(fileobj=StringIO(resp.read())).read
+            read = gzip.GzipFile(fileobj=BytesIO(resp.read())).read
         else:
             read = resp.read
 

+ 1 - 0
dulwich/object_store.py

@@ -362,6 +362,7 @@ class PackBasedObjectStore(BaseObjectStore):
             self._remove_loose_object(obj.id)
         for pack in old_packs:
             self._remove_pack(pack)
+        self._update_pack_cache()
         return len(objects)
 
     def __iter__(self):

+ 1 - 1
dulwich/tests/test_object_store.py

@@ -296,7 +296,7 @@ class PackBasedObjectStoreTests(ObjectStoreTests):
                          set(self.store))
         self.assertEqual(2, len(self.store.packs))
         self.assertEqual(6, self.store.repack())
-        self.assertNotEqual(1, len(self.store.packs))
+        self.assertEqual(1, len(self.store.packs))
         self.assertEqual(0, self.store.pack_loose_objects())