[Python-modules-commits] [dulwich] 08/14: Skip remaining python3 tests for swift contrib module.

[Jelmer Vernooij]

This is an automated email from the git hooks/post-receive script.

jelmer pushed a commit to branch master
in repository dulwich.

commit 03b55c97aaee71e2aab282198f9cce3ffe152e5e
Author: Jelmer Vernooij <jelmer at jelmer.uk>
Date:   Tue Jul 5 22:42:29 2016 +0000

    Skip remaining python3 tests for swift contrib module.
---
 NEWS                          | 3 +++
 dulwich/contrib/swift.py      | 6 ++----
 dulwich/contrib/test_swift.py | 1 +
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/NEWS b/NEWS
index a53b624..bee65d0 100644
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,9 @@
   * Fix regression removing untouched refs when pushing over SSH.
     (Jelmer Vernooij #441)
 
+  * Skip Python3 tests for SWIFT contrib module, as it has not yet
+    been ported.
+
 0.14.0	2016-07-03
 
  BUG FIXES
diff --git a/dulwich/contrib/swift.py b/dulwich/contrib/swift.py
index 6b96897..75b8d28 100644
--- a/dulwich/contrib/swift.py
+++ b/dulwich/contrib/swift.py
@@ -530,14 +530,14 @@ class SwiftPackReader(object):
         if self.base_offset + end > self.pack_length:
             data = self.buff[self.offset:]
             self.offset = end
-            return b"".join(data)
+            return data
         if end > len(self.buff):
             # Need to read more from swift
             self._read(more=True)
             return self.read(length)
         data = self.buff[self.offset:end]
         self.offset = end
-        return b"".join(data)
+        return data
 
     def seek(self, offset):
         """Seek to a specified offset
@@ -584,8 +584,6 @@ class SwiftPackData(PackData):
     def get_object_at(self, offset):
         if offset in self._offset_cache:
             return self._offset_cache[offset]
-        assert isinstance(offset, long) or isinstance(offset, int),\
-            'offset was %r' % offset
         assert offset >= self._header_size
         pack_reader = SwiftPackReader(self.scon, self._filename,
                                       self.pack_length)
diff --git a/dulwich/contrib/test_swift.py b/dulwich/contrib/test_swift.py
index 23f723e..889f888 100644
--- a/dulwich/contrib/test_swift.py
+++ b/dulwich/contrib/test_swift.py
@@ -428,6 +428,7 @@ class TestSwiftRepo(TestCase):
 
 
 @skipIf(missing_libs, skipmsg)
+ at skipIfPY3
 class TestPackInfoLoadDump(TestCase):
     def setUp(self):
         conf = swift.load_conf(file=StringIO(config_file %

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/dulwich.git