From af86f05d11c3613a418f7d3babfdc618e1cac805 Mon Sep 17 00:00:00 2001 From: Yuri Volchkov Date: Fri, 5 Feb 2021 11:22:54 +0100 Subject: [PATCH] Fix inheritance issue at commit.iter_items The iterator used to yield Commit() objects, which does not play well with inheritance. Yield cls() instead. Signed-off-by: Yuri Volchkov --- git/objects/commit.py | 2 +- test/test_commit.py | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/git/objects/commit.py b/git/objects/commit.py index 8a84dd69b..302798cb2 100644 --- a/git/objects/commit.py +++ b/git/objects/commit.py @@ -269,7 +269,7 @@ def _iter_from_process_or_stream(cls, repo, proc_or_stream): # END handle extra info assert len(hexsha) == 40, "Invalid line: %s" % hexsha - yield Commit(repo, hex_to_bin(hexsha)) + yield cls(repo, hex_to_bin(hexsha)) # END for each line in stream # TODO: Review this - it seems process handling got a bit out of control # due to many developers trying to fix the open file handles issue diff --git a/test/test_commit.py b/test/test_commit.py index 0292545f0..7260a2337 100644 --- a/test/test_commit.py +++ b/test/test_commit.py @@ -199,6 +199,13 @@ def test_iteration(self): less_ltd_commits = list(Commit.iter_items(self.rorepo, 'master', paths=('CHANGES', 'AUTHORS'))) assert len(ltd_commits) < len(less_ltd_commits) + class Child(Commit): + def __init__(self, *args, **kwargs): + super(Child, self).__init__(*args, **kwargs) + + child_commits = list(Child.iter_items(self.rorepo, 'master', paths=('CHANGES', 'AUTHORS'))) + assert type(child_commits[0]) == Child + def test_iter_items(self): # pretty not allowed self.assertRaises(ValueError, Commit.iter_items, self.rorepo, 'master', pretty="raw")