Sfoglia il codice sorgente

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

Jelmer Vernooij 16 anni fa
parent
commit
97fb702359

+ 2 - 2
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("/")
 

+ 3 - 1
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")

+ 3 - 2
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):