aboutsummaryrefslogtreecommitdiff
path: root/git/util.py
diff options
context:
space:
mode:
authorSebastian Thiel <byronimo@gmail.com>2015-01-04 13:48:29 +0100
committerSebastian Thiel <byronimo@gmail.com>2015-01-04 13:48:29 +0100
commitc80d727e374321573bb00e23876a67c77ff466e3 (patch)
tree7590d6ae544eac56e83639d27e1f9013b38d8a4b /git/util.py
parent965a08c3f9f2fbd62691d533425c699c943cb865 (diff)
downloadGitPython-c80d727e374321573bb00e23876a67c77ff466e3.tar.gz
GitPython-c80d727e374321573bb00e23876a67c77ff466e3.zip
Bumped version, updated changelog, reduced code smell
There is more work to do though, as many imports are still incorrect. Also, there are still print statements
Diffstat (limited to 'git/util.py')
-rw-r--r--git/util.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/git/util.py b/git/util.py
index 0408e384..c29ed70b 100644
--- a/git/util.py
+++ b/git/util.py
@@ -17,6 +17,8 @@ import getpass
# Handle once test-cases are back up and running.
from exc import GitCommandError
+# Most of these are unused here, but are for use by git-python modules so these
+# don't see gitdb all the time. Flake of course doesn't like it.
from gitdb.util import (
make_sha,
LockedFD,
@@ -130,7 +132,7 @@ def finalize_process(proc):
"""Wait for the process (clone, fetch, pull or push) and handle its errors accordingly"""
try:
proc.wait()
- except GitCommandError, e:
+ except GitCommandError:
# if a push has rejected items, the command has non-zero return status
# a return status of 128 indicates a connection error - reraise the previous one
if proc.poll() == 128: