Turn more bits into properties.

dulwich/objects.py

@@ -331,6 +331,7 @@ class Commit(ShaFile):
     # XXX: There can be an encoding field.
     self._message = text[count:]
 
+  @property
   def tree(self):
     """Returns the tree that is the state of this commit"""
     return self._tree
@@ -340,18 +341,22 @@ class Commit(ShaFile):
     """Return a list of parents of this commit."""
     return self._parents
 
+  @property
   def author(self):
     """Returns the name of the author of the commit"""
     return self._author
 
+  @property
   def committer(self):
     """Returns the name of the committer of the commit"""
     return self._committer
 
+  @property
   def message(self):
     """Returns the commit message"""
     return self._message
 
+  @property
   def commit_time(self):
     """Returns the timestamp of the commit.
     

dulwich/repo.py

@@ -158,7 +158,7 @@ class Repo(object):
         continue
       i = 0
       for known_commit in history:
-        if known_commit.commit_time() > commit.commit_time():
+        if known_commit.commit_time > commit.commit_time:
           break
         i += 1
       history.insert(i, commit)

dulwich/tests/test_objects.py

@@ -82,37 +82,37 @@ class BlobReadTests(unittest.TestCase):
   def test_read_commit_from_file(self):
     sha = '60dacdc733de308bb77bb76ce0fb0f9b44c9769e'
     c = self.commit(sha)
-    self.assertEqual(c.tree(), tree_sha)
+    self.assertEqual(c.tree, tree_sha)
     self.assertEqual(c.parents, ['0d89f20333fbb1d2f3a94da77f4981373d8f4310'])
-    self.assertEqual(c.author(),
+    self.assertEqual(c.author,
         'James Westby <jw+debian@jameswestby.net>')
-    self.assertEqual(c.committer(),
+    self.assertEqual(c.committer,
         'James Westby <jw+debian@jameswestby.net>')
-    self.assertEqual(c.commit_time(), 1174759230)
-    self.assertEqual(c.message(), 'Test commit\n')
+    self.assertEqual(c.commit_time, 1174759230)
+    self.assertEqual(c.message, 'Test commit\n')
 
   def test_read_commit_no_parents(self):
     sha = '0d89f20333fbb1d2f3a94da77f4981373d8f4310'
     c = self.commit(sha)
-    self.assertEqual(c.tree(), '90182552c4a85a45ec2a835cadc3451bebdfe870')
+    self.assertEqual(c.tree, '90182552c4a85a45ec2a835cadc3451bebdfe870')
     self.assertEqual(c.parents, [])
-    self.assertEqual(c.author(),
+    self.assertEqual(c.author,
         'James Westby <jw+debian@jameswestby.net>')
-    self.assertEqual(c.committer(),
+    self.assertEqual(c.committer,
         'James Westby <jw+debian@jameswestby.net>')
-    self.assertEqual(c.commit_time(), 1174758034)
-    self.assertEqual(c.message(), 'Test commit\n')
+    self.assertEqual(c.commit_time, 1174758034)
+    self.assertEqual(c.message, 'Test commit\n')
 
   def test_read_commit_two_parents(self):
     sha = '5dac377bdded4c9aeb8dff595f0faeebcc8498cc'
     c = self.commit(sha)
-    self.assertEqual(c.tree(), 'd80c186a03f423a81b39df39dc87fd269736ca86')
+    self.assertEqual(c.tree, 'd80c186a03f423a81b39df39dc87fd269736ca86')
     self.assertEqual(c.parents, ['ab64bbdcc51b170d21588e5c5d391ee5c0c96dfd',
                                    '4cffe90e0a41ad3f5190079d7c8f036bde29cbe6'])
-    self.assertEqual(c.author(),
+    self.assertEqual(c.author,
         'James Westby <jw+debian@jameswestby.net>')
-    self.assertEqual(c.committer(),
+    self.assertEqual(c.committer,
         'James Westby <jw+debian@jameswestby.net>')
-    self.assertEqual(c.commit_time(), 1174773719)
-    self.assertEqual(c.message(), 'Merge ../b\n')
+    self.assertEqual(c.commit_time, 1174773719)
+    self.assertEqual(c.message, 'Merge ../b\n')
 

dulwich/tests/test_pack.py

@@ -168,7 +168,7 @@ class TestPack(PackTests):
     def test_commit_obj(self):
         p = self.get_pack(pack1_sha)
         commit = p[commit_sha]
-        self.assertEquals("James Westby <jw+debian@jameswestby.net>", commit.author())
+        self.assertEquals("James Westby <jw+debian@jameswestby.net>", commit.author)
         self.assertEquals([], commit.parents)
 
 

dulwich/tests/test_repository.py

@@ -68,9 +68,9 @@ class RepositoryTests(unittest.TestCase):
   def test_get_tree(self):
     r = self.open_repo('a')
     commit = r.commit(r.head())
-    tree = r.get_tree(commit.tree())
+    tree = r.get_tree(commit.tree)
     self.assertEqual(tree._type, 'tree')
-    self.assertEqual(tree.sha().hexdigest(), commit.tree())
+    self.assertEqual(tree.sha().hexdigest(), commit.tree)
 
   def test_get_tree_not_tree(self):
     r = self.open_repo('a')