@@ -20,7 +20,7 @@ def _init_externals():
         import gitdb
     except ImportError:
         raise ImportError("'gitdb' could not be found in your PYTHONPATH")
-    #END verify import
+    # END verify import
 
 #} END initialization
 
@@ -41,13 +41,13 @@ def _init_externals():
 from git.remote import *
 from git.index import *
 from git.util import (
-                        LockFile,
-                        BlockingLockFile,
-                        Stats,
-                        Actor
-                        )
+    LockFile,
+    BlockingLockFile,
+    Stats,
+    Actor
+)
 
 #} END imports
 
 __all__ = [name for name, obj in locals().items()
-            if not (name.startswith('_') or inspect.ismodule(obj))]
+           if not (name.startswith('_') or inspect.ismodule(obj))]
@@ -4,18 +4,19 @@
 # This module is part of GitPython and is released under
 # the BSD License: http://www.opensource.org/licenses/bsd-license.php
 
-import os, sys
+import os
+import sys
 from util import (
-                    LazyMixin,
-                    stream_copy
-                )
+    LazyMixin,
+    stream_copy
+)
 from exc import GitCommandError
 
 from subprocess import (
-                            call,
-                            Popen,
-                            PIPE
-                        )
+    call,
+    Popen,
+    PIPE
+)
 
 execute_kwargs = ('istream', 'with_keep_cwd', 'with_extended_output',
                   'with_exceptions', 'as_process',
@@ -29,6 +30,7 @@ def dashify(string):
 
 
 class Git(LazyMixin):
+
     """
     The Git class manages communication with the Git binary.
 
@@ -246,7 +248,7 @@ def _set_cache_(self, attr):
             self._version_info = tuple(int(n) for n in version_numbers.split('.')[:4] if n.isdigit())
         else:
             super(Git, self)._set_cache_(attr)
-        #END handle version info
+        # END handle version info
 
     @property
     def working_dir(self):
@@ -336,25 +338,25 @@ def execute(self, command,
 
         # Allow the user to have the command executed in their working dir.
         if with_keep_cwd or self._working_dir is None:
-          cwd = os.getcwd()
+            cwd = os.getcwd()
         else:
-          cwd = self._working_dir
+            cwd = self._working_dir
 
         # Start the process
         env = os.environ.copy()
         env["LC_MESSAGES"] = "C"
         proc = Popen(command,
-                        env=env,
-                        cwd=cwd,
-                        stdin=istream,
-                        stderr=PIPE,
-                        stdout=PIPE,
-                        # Prevent cmd prompt popups on windows by using a shell ... .
-                        # See https://github.com/gitpython-developers/GitPython/pull/126
-                        shell=sys.platform == 'win32',
-                        close_fds=(os.name == 'posix'),  # unsupported on linux
-                        **subprocess_kwargs
-                        )
+                     env=env,
+                     cwd=cwd,
+                     stdin=istream,
+                     stderr=PIPE,
+                     stdout=PIPE,
+                     # Prevent cmd prompt popups on windows by using a shell ... .
+                     # See https://github.com/gitpython-developers/GitPython/pull/126
+                     shell=sys.platform == 'win32',
+                     close_fds=(os.name == 'posix'),  # unsupported on linux
+                     **subprocess_kwargs
+                     )
         if as_process:
             return self.AutoInterrupt(proc, command)
 
@@ -508,7 +510,7 @@ def make_call():
             call.extend([dashify(method)])
             call.extend(args)
             return call
-        #END utility to recreate call after changes
+        # END utility to recreate call after changes
 
         if sys.platform == 'win32':
             try:
@@ -518,7 +520,7 @@ def make_call():
                     # did we switch to git.cmd already, or was it changed from default ? permanently fail
                     if self.GIT_PYTHON_GIT_EXECUTABLE != self.git_exec_name:
                         raise
-                    #END handle overridden variable
+                    # END handle overridden variable
                     type(self).GIT_PYTHON_GIT_EXECUTABLE = self.git_exec_name_win
                     call = [self.GIT_PYTHON_GIT_EXECUTABLE] + list(args)
 
@@ -529,14 +531,14 @@ def make_call():
                         msg = "WARNING: Automatically switched to use git.cmd as git executable, which reduces performance by ~70%."
                         msg += "Its recommended to put git.exe into the PATH or to set the %s environment variable to the executable's location" % self._git_exec_env_var
                         warnings.warn(msg)
-                    #END print of warning
-                #END catch first failure
+                    # END print of warning
+                # END catch first failure
             except WindowsError:
                 raise WindowsError("The system cannot find or execute the file at %r" % self.GIT_PYTHON_GIT_EXECUTABLE)
-            #END provide better error message
+            # END provide better error message
         else:
             return self.execute(make_call(), **_kwargs)
-        #END handle windows default installation
+        # END handle windows default installation
 
     def _parse_object_header(self, header_line):
         """
 
@@ -80,7 +80,7 @@ class SectionConstraint(object):
     It supports all ConfigParser methods that operate on an option"""
     __slots__ = ("_config", "_section_name")
     _valid_attrs_ = ("get_value", "set_value", "get", "set", "getint", "getfloat", "getboolean", "has_option",
-                    "remove_section", "remove_option", "options")
+                     "remove_section", "remove_option", "options")
 
     def __init__(self, config, section):
         self._config = config
@@ -136,7 +136,7 @@ class GitConfigParser(cp.RawConfigParser, object):
                                               # (either : or =), followed
                                               # by any # space/tab
         r'(?P<value>.*)$'                     # everything up to eol
-        )
+    )
 
     # list of RawConfigParser methods able to change the instance
     _mutating_methods_ = ("add_section", "remove_section", "remove_option", "set")
@@ -165,7 +165,8 @@ def __init__(self, file_or_files, read_only=True):
 
         if not read_only:
             if isinstance(file_or_files, (tuple, list)):
-                raise ValueError("Write-ConfigParsers can operate on a single file only, multiple files have been passed")
+                raise ValueError(
+                    "Write-ConfigParsers can operate on a single file only, multiple files have been passed")
             # END single file check
 
             if not isinstance(file_or_files, basestring):
@@ -338,7 +339,7 @@ def write(self):
             # make sure we do not overwrite into an existing file
             if hasattr(fp, 'truncate'):
                 fp.truncate()
-            #END
+            # END
         # END handle stream or file
 
         # WRITE DATA
 
@@ -1,25 +1,25 @@
 """Module with our own gitdb implementation - it uses the git command"""
 from exc import (
-                    GitCommandError,
-                    BadObject
-                )
+    GitCommandError,
+    BadObject
+)
 
 from gitdb.base import (
-                                OInfo,
-                                OStream
-                            )
+    OInfo,
+    OStream
+)
 
 from gitdb.util import (
-                            bin_to_hex,
-                            hex_to_bin
-                        )
+    bin_to_hex,
+    hex_to_bin
+)
 from gitdb.db import GitDB
 from gitdb.db import LooseObjectDB
 
 
 __all__ = ('GitCmdObjectDB', 'GitDB')
 
-#class GitCmdObjectDB(CompoundDB, ObjectDBW):
+# class GitCmdObjectDB(CompoundDB, ObjectDBW):
 
 
 class GitCmdObjectDB(LooseObjectDB):
 
@@ -308,8 +308,8 @@ def _index_from_patch_format(cls, repo, stream):
             new_file, deleted_file = bool(new_file_mode), bool(deleted_file_mode)
 
             index.append(Diff(repo, a_path, b_path, a_blob_id, b_blob_id,
-                old_mode or deleted_file_mode, new_mode or new_file_mode or b_mode,
-                new_file, deleted_file, rename_from, rename_to, diff[header.end():]))
+                              old_mode or deleted_file_mode, new_mode or new_file_mode or b_mode,
+                              new_file, deleted_file, rename_from, rename_to, diff[header.end():]))
 
         return index