Remove unnecessary indirection for DiskObjectStore.

diff --git a/dulwich/repo.py b/dulwich/repo.py
index b20fb667bb1221c57188bc5d317023c26320063a..059e88eaa207830001f7f663ebf1ff40015bdec6 100644 (file)
--- a/dulwich/repo.py
+++ b/dulwich/repo.py
@@ -108,7 +108,8 @@ class Repo(object):
             raise NotGitRepository(root)
         self.path = root
         self.tags = Tags(self.tagdir(), self.get_tags())
-        self._object_store = None
+        self.object_store = DiskObjectStore(
+            os.path.join(self.controldir(), OBJECTDIR))
 
     def controldir(self):
         """Return the path of the control directory."""
@@ -149,16 +150,6 @@ class Repo(object):
             heads = self.heads().values()
         return self.object_store.get_graph_walker(heads)
 
-    def object_dir(self):
-        """Return path of the object directory."""
-        return os.path.join(self.controldir(), OBJECTDIR)
-
-    @property
-    def object_store(self):
-        if self._object_store is None:
-            self._object_store = DiskObjectStore(self.object_dir())
-        return self._object_store
-
     def _get_ref(self, file):
         f = open(file, 'rb')
         try:

diff --git a/dulwich/tests/test_repository.py b/dulwich/tests/test_repository.py
index 43b24967758b23b8e896c2e9e4954a0916ccbdce..f84f01e42ea322866b69efc91ad542ec772a2d76 100644 (file)
--- a/dulwich/tests/test_repository.py
+++ b/dulwich/tests/test_repository.py
@@ -35,7 +35,6 @@ class RepositoryTests(unittest.TestCase):
         r = self.open_repo('a')
         basedir = os.path.join(os.path.dirname(__file__), 'data/repos/a/.git')
         self.assertEqual(r.controldir(), basedir)
-        self.assertEqual(r.object_dir(), os.path.join(basedir, 'objects'))
   
     def test_ref(self):
         r = self.open_repo('a')