Skip to content

Commit 86fa577

Browse files
committed
tree: renamed content_from_string to _from_string to make it private. Removed tests that were testing that method
1 parent a58a60a commit 86fa577

File tree

3 files changed

+5
-29
lines changed

3 files changed

+5
-29
lines changed

CHANGES

+1
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ Tree
5252
* added blobs and trees properties allowing to query the respective items in the
5353
tree
5454
* now mimics behaviour of a read-only list instead of a dict to maintain order.
55+
* content_from_string method is now private and not part of the public API anymore
5556

5657
0.1.6
5758
=====

lib/git/objects/tree.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ def _get_tree_cache(cls, repo, treeish):
5050
"""
5151
out = list()
5252
for line in repo.git.ls_tree(treeish).splitlines():
53-
obj = cls.content_from_string(repo, line)
53+
obj = cls._from_string(repo, line)
5454
if obj is not None:
5555
out.append(obj)
5656
# END if object was handled
@@ -59,7 +59,7 @@ def _get_tree_cache(cls, repo, treeish):
5959

6060

6161
@classmethod
62-
def content_from_string(cls, repo, text):
62+
def _from_string(cls, repo, text):
6363
"""
6464
Parse a content item and create the appropriate object
6565

test/git/test_tree.py

+2-27
Original file line numberDiff line numberDiff line change
@@ -25,35 +25,10 @@ def test_contents_should_cache(self, git):
2525
assert_true(git.called)
2626
assert_equal(2, git.call_count)
2727
assert_equal(git.call_args, (('ls_tree', '34868e6e7384cb5ee51c543a8187fdff2675b5a7'), {}))
28-
29-
def test_content_from_string_tree_should_return_tree(self):
30-
text = fixture('ls_tree_a').splitlines()[-1]
31-
tree = Tree.content_from_string(None, text)
32-
33-
assert_equal(Tree, tree.__class__)
34-
assert_equal("650fa3f0c17f1edb4ae53d8dcca4ac59d86e6c44", tree.id)
35-
assert_equal(0,tree.mode) # git tree objects always use this mode
36-
assert_equal("test", tree.path)
37-
38-
def test_content_from_string_tree_should_return_blob(self):
39-
text = fixture('ls_tree_b').split("\n")[0]
40-
41-
tree = Tree.content_from_string(None, text)
42-
43-
assert_equal(Blob, tree.__class__)
44-
assert_equal("aa94e396335d2957ca92606f909e53e7beaf3fbb", tree.id)
45-
assert_mode_644(tree.mode)
46-
assert_equal("grit.rb", tree.path)
47-
48-
def test_content_from_string_tree_should_return_commit(self):
49-
text = fixture('ls_tree_commit').split("\n")[1]
50-
51-
tree = Tree.content_from_string(None, text)
52-
assert_none(tree)
5328

5429
@raises(TypeError)
55-
def test_content_from_string_invalid_type_should_raise(self):
56-
Tree.content_from_string(None, "040000 bogus 650fa3f0c17f1edb4ae53d8dcca4ac59d86e6c44 test")
30+
def test__from_string_invalid_type_should_raise(self):
31+
Tree._from_string(None, "040000 bogus 650fa3f0c17f1edb4ae53d8dcca4ac59d86e6c44 test")
5732

5833
@patch_object(Blob, 'size')
5934
@patch_object(Git, '_call_process')

0 commit comments

Comments
 (0)