diff options
| -rw-r--r-- | CHANGES | 1 | ||||
| -rw-r--r-- | lib/git/objects/tree.py | 4 | ||||
| -rw-r--r-- | test/git/test_tree.py | 29 |
3 files changed, 5 insertions, 29 deletions
@@ -52,6 +52,7 @@ Tree * added blobs and trees properties allowing to query the respective items in the tree * now mimics behaviour of a read-only list instead of a dict to maintain order. +* content_from_string method is now private and not part of the public API anymore 0.1.6 ===== diff --git a/lib/git/objects/tree.py b/lib/git/objects/tree.py index 707cebaa..1bc35d95 100644 --- a/lib/git/objects/tree.py +++ b/lib/git/objects/tree.py @@ -50,7 +50,7 @@ class Tree(base.IndexObject): """ out = list() for line in repo.git.ls_tree(treeish).splitlines(): - obj = cls.content_from_string(repo, line) + obj = cls._from_string(repo, line) if obj is not None: out.append(obj) # END if object was handled @@ -59,7 +59,7 @@ class Tree(base.IndexObject): @classmethod - def content_from_string(cls, repo, text): + def _from_string(cls, repo, text): """ Parse a content item and create the appropriate object diff --git a/test/git/test_tree.py b/test/git/test_tree.py index e0429db1..0104a16b 100644 --- a/test/git/test_tree.py +++ b/test/git/test_tree.py @@ -25,35 +25,10 @@ class TestTree(TestCase): assert_true(git.called) assert_equal(2, git.call_count) assert_equal(git.call_args, (('ls_tree', '34868e6e7384cb5ee51c543a8187fdff2675b5a7'), {})) - - def test_content_from_string_tree_should_return_tree(self): - text = fixture('ls_tree_a').splitlines()[-1] - tree = Tree.content_from_string(None, text) - - assert_equal(Tree, tree.__class__) - assert_equal("650fa3f0c17f1edb4ae53d8dcca4ac59d86e6c44", tree.id) - assert_equal(0,tree.mode) # git tree objects always use this mode - assert_equal("test", tree.path) - - def test_content_from_string_tree_should_return_blob(self): - text = fixture('ls_tree_b').split("\n")[0] - - tree = Tree.content_from_string(None, text) - - assert_equal(Blob, tree.__class__) - assert_equal("aa94e396335d2957ca92606f909e53e7beaf3fbb", tree.id) - assert_mode_644(tree.mode) - assert_equal("grit.rb", tree.path) - - def test_content_from_string_tree_should_return_commit(self): - text = fixture('ls_tree_commit').split("\n")[1] - - tree = Tree.content_from_string(None, text) - assert_none(tree) @raises(TypeError) - def test_content_from_string_invalid_type_should_raise(self): - Tree.content_from_string(None, "040000 bogus 650fa3f0c17f1edb4ae53d8dcca4ac59d86e6c44 test") + def test__from_string_invalid_type_should_raise(self): + Tree._from_string(None, "040000 bogus 650fa3f0c17f1edb4ae53d8dcca4ac59d86e6c44 test") @patch_object(Blob, 'size') @patch_object(Git, '_call_process') |