summaryrefslogtreecommitdiff
path: root/git/cmd.py
diff options
context:
space:
mode:
authorSebastian Thiel <byronimo@gmail.com>2015-01-06 15:38:20 +0100
committerSebastian Thiel <byronimo@gmail.com>2015-01-06 15:38:20 +0100
commite0c65d6638698f4e3a9e726efca8c0bcf466cd62 (patch)
tree8ef496b0542ee46e1e93954a8b39456e643c40a4 /git/cmd.py
parent02e942b7c603163c87509195d76b2117c4997119 (diff)
downloadgitpython-e0c65d6638698f4e3a9e726efca8c0bcf466cd62.tar.gz
Make flake8 happy
Diffstat (limited to 'git/cmd.py')
-rw-r--r--git/cmd.py7
1 files changed, 3 insertions, 4 deletions
diff --git a/git/cmd.py b/git/cmd.py
index 9b85b14a..7a670c46 100644
--- a/git/cmd.py
+++ b/git/cmd.py
@@ -20,7 +20,6 @@ from .util import (
)
from .exc import GitCommandError
from git.compat import (
- text_type,
string_types,
defenc,
PY3
@@ -400,7 +399,8 @@ class Git(LazyMixin):
if self.GIT_PYTHON_TRACE == 'full':
cmdstr = " ".join(command)
if stderr_value:
- log.info("%s -> %d; stdout: '%s'; stderr: '%s'", cmdstr, status, stdout_value.decode(defenc), stderr_value.decode(defenc))
+ log.info("%s -> %d; stdout: '%s'; stderr: '%s'",
+ cmdstr, status, stdout_value.decode(defenc), stderr_value.decode(defenc))
elif stdout_value:
log.info("%s -> %d; stdout: '%s'", cmdstr, status, stdout_value.decode(defenc))
else:
@@ -413,8 +413,7 @@ class Git(LazyMixin):
else:
raise GitCommandError(command, status, stderr_value)
-
- if isinstance(stdout_value, bytes): # could also be output_stream
+ if isinstance(stdout_value, bytes): # could also be output_stream
stdout_value = stdout_value.decode(defenc)
# Allow access to the command's status code