浏览代码

Skip remaining python3 tests for swift contrib module.

Jelmer Vernooij 8 年之前
父节点
当前提交
03b55c97aa
共有 3 个文件被更改,包括 6 次插入4 次删除
  1. 3 0
      NEWS
  2. 2 4
      dulwich/contrib/swift.py
  3. 1 0
      dulwich/contrib/test_swift.py

+ 3 - 0
NEWS

@@ -5,6 +5,9 @@
   * Fix regression removing untouched refs when pushing over SSH.
   * Fix regression removing untouched refs when pushing over SSH.
     (Jelmer Vernooij #441)
     (Jelmer Vernooij #441)
 
 
+  * Skip Python3 tests for SWIFT contrib module, as it has not yet
+    been ported.
+
 0.14.0	2016-07-03
 0.14.0	2016-07-03
 
 
  BUG FIXES
  BUG FIXES

+ 2 - 4
dulwich/contrib/swift.py

@@ -530,14 +530,14 @@ class SwiftPackReader(object):
         if self.base_offset + end > self.pack_length:
         if self.base_offset + end > self.pack_length:
             data = self.buff[self.offset:]
             data = self.buff[self.offset:]
             self.offset = end
             self.offset = end
-            return b"".join(data)
+            return data
         if end > len(self.buff):
         if end > len(self.buff):
             # Need to read more from swift
             # Need to read more from swift
             self._read(more=True)
             self._read(more=True)
             return self.read(length)
             return self.read(length)
         data = self.buff[self.offset:end]
         data = self.buff[self.offset:end]
         self.offset = end
         self.offset = end
-        return b"".join(data)
+        return data
 
 
     def seek(self, offset):
     def seek(self, offset):
         """Seek to a specified offset
         """Seek to a specified offset
@@ -584,8 +584,6 @@ class SwiftPackData(PackData):
     def get_object_at(self, offset):
     def get_object_at(self, offset):
         if offset in self._offset_cache:
         if offset in self._offset_cache:
             return self._offset_cache[offset]
             return self._offset_cache[offset]
-        assert isinstance(offset, long) or isinstance(offset, int),\
-            'offset was %r' % offset
         assert offset >= self._header_size
         assert offset >= self._header_size
         pack_reader = SwiftPackReader(self.scon, self._filename,
         pack_reader = SwiftPackReader(self.scon, self._filename,
                                       self.pack_length)
                                       self.pack_length)

+ 1 - 0
dulwich/contrib/test_swift.py

@@ -428,6 +428,7 @@ class TestSwiftRepo(TestCase):
 
 
 
 
 @skipIf(missing_libs, skipmsg)
 @skipIf(missing_libs, skipmsg)
+@skipIfPY3
 class TestPackInfoLoadDump(TestCase):
 class TestPackInfoLoadDump(TestCase):
     def setUp(self):
     def setUp(self):
         conf = swift.load_conf(file=StringIO(config_file %
         conf = swift.load_conf(file=StringIO(config_file %