attempt to fix some win32 issues; thanks to Alexander for pointing these out.

diff --git a/dulwich/repo.py b/dulwich/repo.py
index 1f800f58ae5587d66a17d1c3e2f10e85936e763d..0d95c9ed58a6a0f2568641777dfe2f0bfa42760e 100644 (file)
--- a/dulwich/repo.py
+++ b/dulwich/repo.py
@@ -96,7 +96,7 @@ class DiskRefsContainer(RefsContainer):
     def itersubkeys(self, base):
         path = self.refpath(base)
         for root, dirs, files in os.walk(path):
-            dir = root[len(path):].strip("/")
+            dir = root[len(path):].strip("/").replace(os.path.sep, "/")
             for filename in files:
                 yield ("%s/%s" % (dir, filename)).strip("/")
 
@@ -105,7 +105,7 @@ class DiskRefsContainer(RefsContainer):
             yield "HEAD"
         path = self.refpath("")
         for root, dirs, files in os.walk(self.refpath("refs")):
-            dir = root[len(path):].strip("/")
+            dir = root[len(path):].strip("/").replace(os.path.sep, "/")
             for filename in files:
                 yield ("%s/%s" % (dir, filename)).strip("/")
 

diff --git a/dulwich/tests/test_object_store.py b/dulwich/tests/test_object_store.py
index e7f7334fc29c6a8a8bb18d65beaaa45bd8c293f5..43b2f7f6edab8f1dfe988851a29f5702ea303abe 100644 (file)
--- a/dulwich/tests/test_object_store.py
+++ b/dulwich/tests/test_object_store.py
@@ -22,12 +22,14 @@ from dulwich.object_store import (
     DiskObjectStore,
     MemoryObjectStore,
     )
+import os
+
 
 class DiskObjectStoreTests(TestCase):
 
     def test_pack_dir(self):
         o = DiskObjectStore("foo")
-        self.assertEquals("foo/pack", o.pack_dir)
+        self.assertEquals(os.path.join("foo", "pack"), o.pack_dir)
 
     def test_empty_packs(self):
         o = DiskObjectStore("foo")

diff --git a/dulwich/tests/test_repository.py b/dulwich/tests/test_repository.py
index 8b1f3a0e20ffa5d8bdf95f7da740ec1f3e349681..62094d5adc8545737be5ca32ec0447987e0469a0 100644 (file)
--- a/dulwich/tests/test_repository.py
+++ b/dulwich/tests/test_repository.py
@@ -29,11 +29,12 @@ class RepositoryTests(unittest.TestCase):
   
     def open_repo(self, name):
         return Repo(os.path.join(os.path.dirname(__file__),
-                          'data/repos', name, '.git'))
+                          'data', 'repos', name, '.git'))
   
     def test_simple_props(self):
         r = self.open_repo('a')
-        basedir = os.path.join(os.path.dirname(__file__), 'data/repos/a/.git')
+        basedir = os.path.join(os.path.dirname(__file__), 
+                os.path.join('data', 'repos', 'a', '.git'))
         self.assertEqual(r.controldir(), basedir)
   
     def test_ref(self):