From 433406af1b5c946d1e0174972a86b707e82e49e1 Mon Sep 17 00:00:00 2001 From: JJ Graham Date: Wed, 23 Oct 2019 20:28:08 -0500 Subject: [PATCH 1/2] Fix #820 --- git/remote.py | 4 ++-- git/test/test_remote.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/git/remote.py b/git/remote.py index 23337a9c8..05d7d0db5 100644 --- a/git/remote.py +++ b/git/remote.py @@ -717,7 +717,7 @@ def _get_push_info(self, proc, progress): # read the lines manually as it will use carriage returns between the messages # to override the previous one. This is why we read the bytes manually progress_handler = progress.new_message_handler() - output = IterableList('name') + output = [] def stdout_handler(line): try: @@ -833,7 +833,7 @@ def push(self, refspec=None, progress=None, **kwargs): :note: No further progress information is returned after push returns. :param kwargs: Additional arguments to be passed to git-push :return: - IterableList(PushInfo, ...) iterable list of PushInfo instances, each + list(PushInfo, ...) list of PushInfo instances, each one informing about an individual head which had been updated on the remote side. If the push contains rejected heads, these will have the PushInfo.ERROR bit set diff --git a/git/test/test_remote.py b/git/test/test_remote.py index 95898f125..f6ef3dbda 100644 --- a/git/test/test_remote.py +++ b/git/test/test_remote.py @@ -325,7 +325,7 @@ def _assert_push_and_pull(self, remote, rw_repo, remote_repo): self._commit_random_file(rw_repo) progress = TestRemoteProgress() res = remote.push(lhead.reference, progress) - self.assertIsInstance(res, IterableList) + self.assertIsInstance(res, list) self._do_test_push_result(res, remote) progress.make_assertion() From 41d90c80bcd79dc827c38f19b2589eeeee939db0 Mon Sep 17 00:00:00 2001 From: JJ Graham Date: Wed, 23 Oct 2019 21:42:37 -0500 Subject: [PATCH 2/2] Removing unused import --- git/test/test_remote.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git/test/test_remote.py b/git/test/test_remote.py index f6ef3dbda..3ef474727 100644 --- a/git/test/test_remote.py +++ b/git/test/test_remote.py @@ -31,7 +31,7 @@ GIT_DAEMON_PORT, assert_raises ) -from git.util import IterableList, rmtree, HIDE_WINDOWS_FREEZE_ERRORS +from git.util import rmtree, HIDE_WINDOWS_FREEZE_ERRORS import os.path as osp