Fix fastimport support on python3.4.

stevegt · Apr 24, 2016 · 18884ba · 18884ba
1 parent 9419880
commit 18884ba
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -9,7 +9,7 @@ matrix:
     - python: "pypy"
       env: TEST_REQUIRE="fastimport"
     - python: "3.4"
-      env: TEST_REQUIRE=
+      env: TEST_REQUIRE="fastimport"
     - python: "3.5"
       env: TEST_REQUIRE="fastimport"
 cache:

diff --git a/dulwich/fastexport.py b/dulwich/fastexport.py
@@ -62,7 +62,7 @@ def print_cmd(self, cmd):
 
     def _allocate_marker(self):
         self._marker_idx+=1
-        return b"%d" % (self._marker_idx,)
+        return ("%d" % (self._marker_idx,)).encode('ascii')
 
     def _export_blob(self, blob):
         marker = self._allocate_marker()
@@ -87,7 +87,7 @@ def _iter_files(self, base_tree, new_tree):
             if old_path != new_path and old_path is not None:
                 yield commands.FileRenameCommand(old_path, new_path)
             if old_mode != new_mode or old_hexsha != new_hexsha:
-                prefixed_marker = b':%s' %  (marker,)
+                prefixed_marker = b':' + marker
                 yield commands.FileModifyCommand(
                     new_path, new_mode, prefixed_marker, None
                 )