Make flake8 happy

Byron · Byron · commit e0c65d663869 · 2015-01-06T15:38:20.000+01:00
diff --git a/git/cmd.py b/git/cmd.py
@@ -20,7 +20,6 @@
 )
 from .exc import GitCommandError
 from git.compat import (
-    text_type,
     string_types,
     defenc,
     PY3
@@ -400,7 +399,8 @@ def execute(self, command,
         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 @@ def execute(self, command,
             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
diff --git a/git/config.py b/git/config.py
@@ -178,7 +178,7 @@ def __init__(self, file_or_files, read_only=True):
         # Used in python 3, needs to stay in sync with sections for underlying implementation to work
         if not hasattr(self, '_proxies'):
             self._proxies = self._dict()
-        
+
         self._file_or_files = file_or_files
         self._read_only = read_only
         self._is_initialized = False
@@ -206,7 +206,7 @@ def __del__(self):
 
     def release(self):
         """Flush changes and release the configuration write lock. This instance must not be used anymore afterwards.
-        In Python 3, it's required to explicitly release locks and flush changes, as __del__ is not called 
+        In Python 3, it's required to explicitly release locks and flush changes, as __del__ is not called
         deterministically anymore."""
         # checking for the lock here makes sure we do not raise during write()
         # in case an invalid parser was created who could not get a lock
diff --git a/git/objects/commit.py b/git/objects/commit.py
@@ -382,14 +382,14 @@ def _serialize(self, stream):
         c = self.committer
         fmt = "%s %s <%s> %s %s\n"
         write((fmt % ("author", aname, a.email,
-                     self.authored_date,
-                     altz_to_utctz_str(self.author_tz_offset))).encode(self.encoding))
+                      self.authored_date,
+                      altz_to_utctz_str(self.author_tz_offset))).encode(self.encoding))
 
         # encode committer
         aname = c.name
         write((fmt % ("committer", aname, c.email,
-                     self.committed_date,
-                     altz_to_utctz_str(self.committer_tz_offset))).encode(self.encoding))
+                      self.committed_date,
+                      altz_to_utctz_str(self.committer_tz_offset))).encode(self.encoding))
 
         if self.encoding != self.default_encoding:
             write(("encoding %s\n" % self.encoding).encode('ascii'))
diff --git a/git/objects/fun.py b/git/objects/fun.py
@@ -40,6 +40,7 @@ def tree_to_stream(entries, write):
         write(b''.join((mode_str, b' ', name, b'\0', binsha)))
     # END for each item
 
+
 def tree_entries_from_data(data):
     """Reads the binary representation of a tree and returns tuples of Tree items
     :param data: data block with tree data (as bytes)
diff --git a/git/refs/log.py b/git/refs/log.py
@@ -256,7 +256,7 @@ def append_entry(cls, config_reader, filepath, oldbinsha, newbinsha, message):
         committer = isinstance(config_reader, Actor) and config_reader or Actor.committer(config_reader)
         entry = RefLogEntry((
             bin_to_hex(oldbinsha).decode('ascii'),
-            bin_to_hex(newbinsha).decode('ascii'), 
+            bin_to_hex(newbinsha).decode('ascii'),
             committer, (int(time.time()), time.altzone), message
         ))
 
diff --git a/git/refs/symbolic.py b/git/refs/symbolic.py
@@ -144,7 +144,7 @@ def _get_ref_info(cls, repo, ref_path):
             for sha, path in cls._iter_packed_refs(repo):
                 if path != ref_path:
                     continue
-                # sha will be used as 
+                # sha will be used
                 tokens = sha, path
                 break
             # END for each packed ref
diff --git a/git/test/performance/test_commit.py b/git/test/performance/test_commit.py
@@ -15,7 +15,6 @@
 from git.test.test_commit import assert_commit_serialization
 
 
-
 class TestPerformance(TestBigRepoRW):
 
     # ref with about 100 commits in its history
diff --git a/git/test/test_commit.py b/git/test/test_commit.py
@@ -19,7 +19,6 @@
     Actor,
 )
 from gitdb import IStream
-from gitdb.util import hex_to_bin
 from git.compat import (
     string_types,
     text_type
diff --git a/git/test/test_config.py b/git/test/test_config.py
@@ -18,6 +18,7 @@
 from copy import copy
 from git.config import cp
 
+
 class TestBase(TestCase):
 
     def _to_memcache(self, file_path):
diff --git a/git/test/test_stats.py b/git/test/test_stats.py
@@ -12,6 +12,7 @@
 from git import Stats
 from git.compat import defenc
 
+
 class TestStats(TestBase):
 
     def test_list_from_string(self):
diff --git a/git/test/test_tree.py b/git/test/test_tree.py
@@ -138,7 +138,7 @@ def test_traverse(self):
             # END check for slash
 
             # slashes in paths are supported as well
-            # NOTE: on py3, / doesn't work with strings anymore ... 
+            # NOTE: on py3, / doesn't work with strings anymore ...
             assert root[item.path] == item == root / item.path
         # END for each item
         assert found_slash

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,6 @@`
`19`	`19`	`Actor,`
`20`	`20`	`)`
`21`	`21`	`from gitdb import IStream`
`22`		`-from gitdb.util import hex_to_bin`
`23`	`22`	`from git.compat import (`
`24`	`23`	`string_types,`
`25`	`24`	`text_type`