Merge pull request #173 from craigez/feature/pep8

Autopep8 style whitespace cleanups & pre-commit hook

3 files changed, 325 insertions, 303 deletions

diff --git a/git/objects/submodule/base.py b/git/objects/submodule/base.py
index ff908d4a..2608f5db 100644
--- a/git/objects/submodule/base.py
+++ b/git/objects/submodule/base.py
@@ -5,29 +5,29 @@
 from git.util import RepoAliasMixin
 import util
 from util import (
-                    mkhead,
-                    sm_name, 
-                    sm_section, 
-                    unbare_repo, 
-                    SubmoduleConfigParser,
-                    find_first_remote_branch
-                )
+    mkhead,
+    sm_name,
+    sm_section,
+    unbare_repo,
+    SubmoduleConfigParser,
+    find_first_remote_branch
+)
 from git.objects.util import Traversable
 from StringIO import StringIO                   # need a dict to set bloody .name field
 from git.util import (
-                        Iterable, 
-                        join_path_native, 
-                        to_native_path_linux,
-                        rmtree
-                    )
+    Iterable,
+    join_path_native,
+    to_native_path_linux,
+    rmtree
+)
 
 from git.db.interface import RemoteProgress
 
 from git.config import SectionConstraint
 from git.exc import (
-                    InvalidGitRepositoryError, 
-                    NoSuchPathError
-                    )
+    InvalidGitRepositoryError,
+    NoSuchPathError
+)
 
 import stat
 import git          # we use some types indirectly to prevent cyclic imports !
@@ -40,14 +40,15 @@ __all__ = ["Submodule", "UpdateProgress"]
 
 
 class UpdateProgress(RemoteProgress):
+
     """Class providing detailed progress information to the caller who should 
     derive from it and implement the ``update(...)`` message"""
-    CLONE, FETCH, UPDWKTREE = [1 << x for x in range(RemoteProgress._num_op_codes, RemoteProgress._num_op_codes+3)]
+    CLONE, FETCH, UPDWKTREE = [1 << x for x in range(RemoteProgress._num_op_codes, RemoteProgress._num_op_codes + 3)]
     _num_op_codes = RemoteProgress._num_op_codes + 3
-    
+
     __slots__ = tuple()
-    
-    
+
+
 BEGIN = UpdateProgress.BEGIN
 END = UpdateProgress.END
 CLONE = UpdateProgress.CLONE
@@ -55,37 +56,38 @@ FETCH = UpdateProgress.FETCH
 UPDWKTREE = UpdateProgress.UPDWKTREE
 
 
-# IndexObject comes via util module, its a 'hacky' fix thanks to pythons import 
+# IndexObject comes via util module, its a 'hacky' fix thanks to pythons import
 # mechanism which cause plenty of trouble of the only reason for packages and
 # modules is refactoring - subpackages shoudn't depend on parent packages
 class Submodule(util.IndexObject, Iterable, Traversable, RepoAliasMixin):
+
     """Implements access to a git submodule. They are special in that their sha
     represents a commit in the submodule's repository which is to be checked out
     at the path of this instance. 
     The submodule type does not have a string type associated with it, as it exists
     solely as a marker in the tree and index.
-    
+
     All methods work in bare and non-bare repositories."""
-    
+
     _id_attribute_ = "name"
     k_modules_file = '.gitmodules'
     k_head_option = 'branch'
     k_head_default = 'master'
     k_default_mode = stat.S_IFDIR | stat.S_IFLNK        # submodules are directories with link-status
-    
+
     # this is a bogus type for base class compatability
     type = 'submodule'
-    
+
     # this type doesn't really have a type id
     type_id = 0
-    
+
     __slots__ = ('_parent_commit', '_url', '_branch_path', '_name', '__weakref__')
     _cache_attrs = ('path', '_url', '_branch_path')
-    
-    def __init__(self, repo, binsha, mode=None, path=None, name = None, parent_commit=None, url=None, branch_path=None):
+
+    def __init__(self, repo, binsha, mode=None, path=None, name=None, parent_commit=None, url=None, branch_path=None):
         """Initialize this instance with its attributes. We only document the ones 
         that differ from ``IndexObject``
-        
+
         :param repo: Our parent repository
         :param binsha: binary sha referring to a commit in the remote repository, see url parameter
         :param parent_commit: a Commit object instance, see set_parent_commit() for more information
@@ -102,7 +104,7 @@ class Submodule(util.IndexObject, Iterable, Traversable, RepoAliasMixin):
             self._branch_path = branch_path
         if name is not None:
             self._name = name
-    
+
     def _set_cache_(self, attr):
         if attr == '_parent_commit':
             # set a default value, which is the root tree of the current head
@@ -119,7 +121,7 @@ class Submodule(util.IndexObject, Iterable, Traversable, RepoAliasMixin):
         else:
             super(Submodule, self)._set_cache_(attr)
         # END handle attribute name
-        
+
     def _get_intermediate_items(self, item):
         """:return: all the submodules of our module repository"""
         try:
@@ -127,28 +129,28 @@ class Submodule(util.IndexObject, Iterable, Traversable, RepoAliasMixin):
         except InvalidGitRepositoryError:
             return list()
         # END handle intermeditate items
-        
+
     def __eq__(self, other):
         """Compare with another submodule"""
         # we may only compare by name as this should be the ID they are hashed with
         # Otherwise this type wouldn't be hashable
         # return self.path == other.path and self.url == other.url and super(Submodule, self).__eq__(other)
         return self._name == other._name
-        
+
     def __ne__(self, other):
         """Compare with another submodule for inequality"""
         return not (self == other)
-        
+
     def __hash__(self):
         """Hash this instance using its logical id, not the sha"""
         return hash(self._name)
-        
+
     def __str__(self):
         return self._name
-        
+
     def __repr__(self):
-        return "git.%s(name=%s, path=%s, url=%s, branch_path=%s)" % (type(self).__name__, self._name, self.path, self.url, self.branch_path) 
-        
+        return "git.%s(name=%s, path=%s, url=%s, branch_path=%s)" % (type(self).__name__, self._name, self.path, self.url, self.branch_path)
+
     @classmethod
     def _config_parser(cls, repo, parent_commit, read_only):
         """:return: Config Parser constrained to our submodule in read or write mode
@@ -167,15 +169,16 @@ class Submodule(util.IndexObject, Iterable, Traversable, RepoAliasMixin):
             try:
                 fp_module = cls._sio_modules(parent_commit)
             except KeyError:
-                raise IOError("Could not find %s file in the tree of parent commit %s" % (cls.k_modules_file, parent_commit))
+                raise IOError("Could not find %s file in the tree of parent commit %s" %
+                              (cls.k_modules_file, parent_commit))
             # END handle exceptions
         # END handle non-bare working tree
-        
+
         if not read_only and (repo.bare or not parent_matches_head):
             raise ValueError("Cannot write blobs of 'historical' submodule configurations")
         # END handle writes of historical submodules
-        
-        return SubmoduleConfigParser(fp_module, read_only = read_only)
+
+        return SubmoduleConfigParser(fp_module, read_only=read_only)
 
     def _clear_cache(self):
         # clear the possibly changed values
@@ -186,29 +189,29 @@ class Submodule(util.IndexObject, Iterable, Traversable, RepoAliasMixin):
                 pass
             # END try attr deletion
         # END for each name to delete
-        
+
     @classmethod
     def _sio_modules(cls, parent_commit):
         """:return: Configuration file as StringIO - we only access it through the respective blob's data"""
         sio = StringIO(parent_commit.tree[cls.k_modules_file].data_stream.read())
         sio.name = cls.k_modules_file
         return sio
-    
+
     def _config_parser_constrained(self, read_only):
         """:return: Config Parser constrained to our submodule in read or write mode"""
         parser = self._config_parser(self.repo, self._parent_commit, read_only)
         parser.set_submodule(self)
         return SectionConstraint(parser, sm_section(self.name))
-        
+
     #{ Edit Interface
-    
+
     @classmethod
     def add(cls, repo, name, path, url=None, branch=None, no_checkout=False,  repoType=None):
         """Add a new submodule to the given repository. This will alter the index
         as well as the .gitmodules file, but will not create a new commit.
         If the submodule already exists, no matter if the configuration differs
         from the one provided, the existing submodule will be returned.
-        
+
         :param repo: Repository instance which should receive the submodule
         :param name: The name/identifier for the submodule
         :param path: repository-relative or absolute path at which the submodule 
@@ -236,20 +239,20 @@ class Submodule(util.IndexObject, Iterable, Traversable, RepoAliasMixin):
         if repo.bare:
             raise InvalidGitRepositoryError("Cannot add submodules to bare repositories")
         # END handle bare repos
-        
+
         repoType = repoType or git.Repo
-        
+
         path = to_native_path_linux(path)
         if path.endswith('/'):
             path = path[:-1]
         # END handle trailing slash
-        
-        # assure we never put backslashes into the url, as some operating systems 
-        # like it ... 
+
+        # assure we never put backslashes into the url, as some operating systems
+        # like it ...
         if url != None:
             url = to_native_path_linux(url)
-        #END assure url correctness
-        
+        # END assure url correctness
+
         # INSTANTIATE INTERMEDIATE SM
         sm = cls(repo, cls.NULL_BIN_SHA, cls.k_default_mode, path, name)
         if sm.exists():
@@ -264,17 +267,18 @@ class Submodule(util.IndexObject, Iterable, Traversable, RepoAliasMixin):
                 return sm
             # END handle exceptions
         # END handle existing
-        
+
         # fake-repo - we only need the functionality on the branch instance
         br = git.Head(repo, git.Head.to_full_path(str(branch) or cls.k_head_default))
         has_module = sm.module_exists()
         branch_is_default = branch is None
         if has_module and url is not None:
             if url not in [r.url for r in sm.module().remotes]:
-                raise ValueError("Specified URL '%s' does not match any remote url of the repository at '%s'" % (url, sm.abspath))
+                raise ValueError(
+                    "Specified URL '%s' does not match any remote url of the repository at '%s'" % (url, sm.abspath))
             # END check url
         # END verify urls match
-        
+
         mrepo = None
         if url is None:
             if not has_module:
@@ -288,19 +292,19 @@ class Submodule(util.IndexObject, Iterable, Traversable, RepoAliasMixin):
             url = urls[0]
         else:
             # clone new repo
-            kwargs = {'n' : no_checkout}
+            kwargs = {'n': no_checkout}
             if not branch_is_default:
                 kwargs['b'] = br.name
             # END setup checkout-branch
             mrepo = repoType.clone_from(url, path, **kwargs)
         # END verify url
-        
+
         # update configuration and index
         index = sm.repo.index
         writer = sm.config_writer(index=index, write=False)
         writer.set_value('url', url)
         writer.set_value('path', path)
-        
+
         sm._url = url
         if not branch_is_default:
             # store full path
@@ -308,20 +312,20 @@ class Submodule(util.IndexObject, Iterable, Traversable, RepoAliasMixin):
             sm._branch_path = br.path
         # END handle path
         del(writer)
-        
+
         # we deliberatly assume that our head matches our index !
         pcommit = repo.head.commit
         sm._parent_commit = pcommit
         sm.binsha = mrepo.head.commit.binsha
         index.add([sm], write=True)
-        
+
         return sm
-        
-    def update(self, recursive=False, init=True, to_latest_revision=False, progress=None, 
-                dry_run=False, ):
+
+    def update(self, recursive=False, init=True, to_latest_revision=False, progress=None,
+               dry_run=False, ):
         """Update the repository of this submodule to point to the checkout
         we point at with the binsha of this instance.
-        
+
         :param recursive: if True, we will operate recursively and update child-
             modules as well.
         :param init: if True, the module repository will be cloned into place if necessary
@@ -338,21 +342,21 @@ class Submodule(util.IndexObject, Iterable, Traversable, RepoAliasMixin):
         :return: self"""
         if self.repo.bare:
             return self
-        #END pass in bare mode
-        
+        # END pass in bare mode
+
         if progress is None:
             progress = UpdateProgress()
-        #END handle progress
+        # END handle progress
         prefix = ''
         if dry_run:
             prefix = "DRY-RUN: "
-        #END handle prefix
-        
+        # END handle prefix
+
         # to keep things plausible in dry-run mode
         if dry_run:
             mrepo = None
-        #END init mrepo
-        
+        # END init mrepo
+
         # ASSURE REPO IS PRESENT AND UPTODATE
         #####################################
         try:
@@ -363,24 +367,24 @@ class Submodule(util.IndexObject, Iterable, Traversable, RepoAliasMixin):
                 op = FETCH
                 if i == 0:
                     op |= BEGIN
-                #END handle start
-                
-                progress.update(op, i, len_rmts, prefix+"Fetching remote %s of submodule %r" % (remote, self.name))
+                # END handle start
+
+                progress.update(op, i, len_rmts, prefix + "Fetching remote %s of submodule %r" % (remote, self.name))
                 #===============================
                 if not dry_run:
                     remote.fetch(progress=progress)
-                #END handle dry-run
+                # END handle dry-run
                 #===============================
-                if i == len_rmts-1:
+                if i == len_rmts - 1:
                     op |= END
-                #END handle end
-                progress.update(op, i, len_rmts, prefix+"Done fetching remote of submodule %r" % self.name)
-            #END fetch new data
+                # END handle end
+                progress.update(op, i, len_rmts, prefix + "Done fetching remote of submodule %r" % self.name)
+            # END fetch new data
         except InvalidGitRepositoryError:
             if not init:
                 return self
             # END early abort if init is not allowed
-            
+
             # there is no git-repository yet - but delete empty paths
             module_path = join_path_native(self.repo.working_tree_dir, self.path)
             if not dry_run and os.path.isdir(module_path):
@@ -390,44 +394,43 @@ class Submodule(util.IndexObject, Iterable, Traversable, RepoAliasMixin):
                     raise OSError("Module directory at %r does already exist and is non-empty" % module_path)
                 # END handle OSError
             # END handle directory removal
-            
+
             # don't check it out at first - nonetheless it will create a local
             # branch according to the remote-HEAD if possible
-            progress.update(BEGIN|CLONE, 0, 1, prefix+"Cloning %s to %s in submodule %r" % (self.url, module_path, self.name))
+            progress.update(BEGIN | CLONE, 0, 1, prefix + "Cloning %s to %s in submodule %r" %
+                            (self.url, module_path, self.name))
             if not dry_run:
                 mrepo = type(self.repo).clone_from(self.url, module_path, n=True)
-            #END handle dry-run
-            progress.update(END|CLONE, 0, 1, prefix+"Done cloning to %s" % module_path)
-            
-            
+            # END handle dry-run
+            progress.update(END | CLONE, 0, 1, prefix + "Done cloning to %s" % module_path)
+
             if not dry_run:
                 # see whether we have a valid branch to checkout
                 try:
                     # find  a remote which has our branch - we try to be flexible
                     remote_branch = find_first_remote_branch(mrepo.remotes, self.branch_name)
                     local_branch = mkhead(mrepo, self.branch_path)
-                    
+
                     # have a valid branch, but no checkout - make sure we can figure
                     # that out by marking the commit with a null_sha
                     local_branch.set_object(util.Object(mrepo, self.NULL_BIN_SHA))
                     # END initial checkout + branch creation
-                    
+
                     # make sure HEAD is not detached
                     mrepo.head.set_reference(local_branch, logmsg="submodule: attaching head to %s" % local_branch)
                     mrepo.head.ref.set_tracking_branch(remote_branch)
                 except IndexError:
-                    print >> sys.stderr, "Warning: Failed to checkout tracking branch %s" % self.branch_path 
-                #END handle tracking branch
-                
+                    print >> sys.stderr, "Warning: Failed to checkout tracking branch %s" % self.branch_path
+                # END handle tracking branch
+
                 # NOTE: Have to write the repo config file as well, otherwise
                 # the default implementation will be offended and not update the repository
-                # Maybe this is a good way to assure it doesn't get into our way, but 
+                # Maybe this is a good way to assure it doesn't get into our way, but
                 # we want to stay backwards compatible too ... . Its so redundant !
                 self.repo.config_writer().set_value(sm_section(self.name), 'url', self.url)
-            #END handle dry_run
-        #END handle initalization
-        
-        
+            # END handle dry_run
+        # END handle initalization
+
         # DETERMINE SHAS TO CHECKOUT
         ############################
         binsha = self.binsha
@@ -435,8 +438,8 @@ class Submodule(util.IndexObject, Iterable, Traversable, RepoAliasMixin):
         if mrepo is not None:
             # mrepo is only set if we are not in dry-run mode or if the module existed
             is_detached = mrepo.head.is_detached
-        #END handle dry_run
-        
+        # END handle dry_run
+
         if mrepo is not None and to_latest_revision:
             msg_base = "Cannot update to latest revision in repository at %r as " % mrepo.working_dir
             if not is_detached:
@@ -446,21 +449,23 @@ class Submodule(util.IndexObject, Iterable, Traversable, RepoAliasMixin):
                     binsha = rcommit.binsha
                     hexsha = rcommit.hexsha
                 else:
-                    print >> sys.stderr, "%s a tracking branch was not set for local branch '%s'" % (msg_base, mrepo.head.ref) 
+                    print >> sys.stderr, "%s a tracking branch was not set for local branch '%s'" % (
+                        msg_base, mrepo.head.ref)
                 # END handle remote ref
             else:
                 print >> sys.stderr, "%s there was no local tracking branch" % msg_base
             # END handle detached head
         # END handle to_latest_revision option
-        
+
         # update the working tree
         # handles dry_run
         if mrepo is not None and mrepo.head.commit.binsha != binsha:
-            progress.update(BEGIN|UPDWKTREE, 0, 1, prefix+"Updating working tree at %s for submodule %r to revision %s" % (self.path, self.name, hexsha))
+            progress.update(BEGIN | UPDWKTREE, 0, 1, prefix +
+                            "Updating working tree at %s for submodule %r to revision %s" % (self.path, self.name, hexsha))
             if not dry_run:
                 if is_detached:
                     # NOTE: for now we force, the user is no supposed to change detached
-                    # submodules anyway. Maybe at some point this becomes an option, to 
+                    # submodules anyway. Maybe at some point this becomes an option, to
                     # properly handle user modifications - see below for future options
                     # regarding rebase and merge.
                     mrepo.git.checkout(hexsha, force=True)
@@ -470,10 +475,10 @@ class Submodule(util.IndexObject, Iterable, Traversable, RepoAliasMixin):
                     # branch - this should be prevented when setting the branch option
                     mrepo.head.reset(hexsha, index=True, working_tree=True)
                 # END handle checkout
-            #END handle dry_run
-            progress.update(END|UPDWKTREE, 0, 1, prefix+"Done updating working tree for submodule %r" % self.name)
+            # END handle dry_run
+            progress.update(END | UPDWKTREE, 0, 1, prefix + "Done updating working tree for submodule %r" % self.name)
         # END update to new commit only if needed
-        
+
         # HANDLE RECURSION
         ##################
         if recursive:
@@ -482,17 +487,17 @@ class Submodule(util.IndexObject, Iterable, Traversable, RepoAliasMixin):
                 for submodule in self.iter_items(self.module()):
                     submodule.update(recursive, init, to_latest_revision, progress=progress, dry_run=dry_run)
                 # END handle recursive update
-            #END handle dry run
+            # END handle dry run
         # END for each submodule
-            
+
         return self
-        
+
     @unbare_repo
     def move(self, module_path, configuration=True, module=True):
         """Move the submodule to a another module path. This involves physically moving
         the repository at our current path, changing the configuration, as well as
         adjusting our index entry accordingly.
-        
+
         :param module_path: the path to which to move our module, given as
             repository-relative path. Intermediate directories will be created
             accordingly. If the path already exists, it must be empty.
@@ -510,59 +515,58 @@ class Submodule(util.IndexObject, Iterable, Traversable, RepoAliasMixin):
         """
         if module + configuration < 1:
             raise ValueError("You must specify to move at least the module or the configuration of the submodule")
-        #END handle input
-        
+        # END handle input
+
         module_path = to_native_path_linux(module_path)
         if module_path.endswith('/'):
             module_path = module_path[:-1]
         # END handle trailing slash
-        
+
         # VERIFY DESTINATION
         if module_path == self.path:
             return self
-        #END handle no change
-        
+        # END handle no change
+
         dest_path = join_path_native(self.repo.working_tree_dir, module_path)
         if os.path.isfile(dest_path):
             raise ValueError("Cannot move repository onto a file: %s" % dest_path)
         # END handle target files
-        
+
         index = self.repo.index
         tekey = index.entry_key(module_path, 0)
         # if the target item already exists, fail
         if configuration and tekey in index.entries:
             raise ValueError("Index entry for target path did alredy exist")
-        #END handle index key already there
-        
+        # END handle index key already there
+
         # remove existing destination
         if module:
             if os.path.exists(dest_path):
                 if len(os.listdir(dest_path)):
                     raise ValueError("Destination module directory was not empty")
-                #END handle non-emptyness
-                
+                # END handle non-emptyness
+
                 if os.path.islink(dest_path):
                     os.remove(dest_path)
                 else:
                     os.rmdir(dest_path)
-                #END handle link
+                # END handle link
             else:
                 # recreate parent directories
                 # NOTE: renames() does that now
                 pass
-            #END handle existance
+            # END handle existance
         # END handle module
-        
+
         # move the module into place if possible
         cur_path = self.abspath
         renamed_module = False
         if module and os.path.exists(cur_path):
             os.renames(cur_path, dest_path)
             renamed_module = True
-        #END move physical module
-        
-        
-        # rename the index entry - have to manipulate the index directly as 
+        # END move physical module
+
+        # rename the index entry - have to manipulate the index directly as
         # git-mv cannot be used on submodules ... yeah
         try:
             if configuration:
@@ -570,12 +574,12 @@ class Submodule(util.IndexObject, Iterable, Traversable, RepoAliasMixin):
                     ekey = index.entry_key(self.path, 0)
                     entry = index.entries[ekey]
                     del(index.entries[ekey])
-                    nentry = git.IndexEntry(entry[:3]+(module_path,)+entry[4:])
+                    nentry = git.IndexEntry(entry[:3] + (module_path,) + entry[4:])
                     index.entries[tekey] = nentry
                 except KeyError:
                     raise InvalidGitRepositoryError("Submodule's entry at %r did not exist" % (self.path))
-                #END handle submodule doesn't exist
-                
+                # END handle submodule doesn't exist
+
                 # update configuration
                 writer = self.config_writer(index=index)        # auto-write
                 writer.set_value('path', module_path)
@@ -587,15 +591,15 @@ class Submodule(util.IndexObject, Iterable, Traversable, RepoAliasMixin):
                 os.renames(dest_path, cur_path)
             # END undo module renaming
             raise
-        #END handle undo rename
-        
+        # END handle undo rename
+
         return self
-        
+
     @unbare_repo
     def remove(self, module=True, force=False, configuration=True, dry_run=False):
         """Remove this submodule from the repository. This will remove our entry
         from the .gitmodules file and the entry in the .git/config file.
-        
+
         :param module: If True, the module we point to will be deleted 
             as well. If the module is currently on a commit which is not part 
             of any branch in the remote, if the currently checked out branch 
@@ -620,7 +624,7 @@ class Submodule(util.IndexObject, Iterable, Traversable, RepoAliasMixin):
         if not (module + configuration):
             raise ValueError("Need to specify to delete at least the module, or the configuration")
         # END handle params
-        
+
         # DELETE MODULE REPOSITORY
         ##########################
         if module and self.module_exists():
@@ -636,20 +640,21 @@ class Submodule(util.IndexObject, Iterable, Traversable, RepoAliasMixin):
                     method = rmtree
                 elif os.path.exists(mp):
                     raise AssertionError("Cannot forcibly delete repository as it was neither a link, nor a directory")
-                #END handle brutal deletion
+                # END handle brutal deletion
                 if not dry_run:
                     assert method
                     method(mp)
-                #END apply deletion method
+                # END apply deletion method
             else:
                 # verify we may delete our module
                 mod = self.module()
                 if mod.is_dirty(untracked_files=True):
-                    raise InvalidGitRepositoryError("Cannot delete module at %s with any modifications, unless force is specified" % mod.working_tree_dir)
+                    raise InvalidGitRepositoryError(
+                        "Cannot delete module at %s with any modifications, unless force is specified" % mod.working_tree_dir)
                 # END check for dirt
-                
+
                 # figure out whether we have new commits compared to the remotes
-                # NOTE: If the user pulled all the time, the remote heads might 
+                # NOTE: If the user pulled all the time, the remote heads might
                 # not have been updated, so commits coming from the remote look
                 # as if they come from us. But we stay strictly read-only and
                 # don't fetch beforhand.
@@ -661,23 +666,24 @@ class Submodule(util.IndexObject, Iterable, Traversable, RepoAliasMixin):
                     # END for each remote ref
                     # not a single remote branch contained all our commits
                     if num_branches_with_new_commits == len(rrefs):
-                        raise InvalidGitRepositoryError("Cannot delete module at %s as there are new commits" % mod.working_tree_dir)
+                        raise InvalidGitRepositoryError(
+                            "Cannot delete module at %s as there are new commits" % mod.working_tree_dir)
                     # END handle new commits
-                    # have to manually delete references as python's scoping is 
+                    # have to manually delete references as python's scoping is
                     # not existing, they could keep handles open ( on windows this is a problem )
                     if len(rrefs):
                         del(rref)
-                    #END handle remotes
+                    # END handle remotes
                     del(rrefs)
                     del(remote)
                 # END for each remote
-                
+
                 # gently remove all submodule repositories
                 for sm in self.children():
                     sm.remove(module=True, force=False, configuration=False, dry_run=dry_run)
                     del(sm)
                 # END for each child-submodule
-                
+
                 # finally delete our own submodule
                 if not dry_run:
                     wtd = mod.working_tree_dir
@@ -686,7 +692,7 @@ class Submodule(util.IndexObject, Iterable, Traversable, RepoAliasMixin):
                 # END delete tree if possible
             # END handle force
         # END handle module deletion
-            
+
         # DELETE CONFIGURATION
         ######################
         if configuration and not dry_run:
@@ -696,10 +702,10 @@ class Submodule(util.IndexObject, Iterable, Traversable, RepoAliasMixin):
                 del(index.entries[index.entry_key(self.path, 0)])
             except KeyError:
                 pass
-            #END delete entry
+            # END delete entry
             index.write()
-            
-            # now git config - need the config intact, otherwise we can't query 
+
+            # now git config - need the config intact, otherwise we can't query
             # inforamtion anymore
             self.repo.config_writer().remove_section(sm_section(self.name))
             self.config_writer().remove_section()
@@ -707,13 +713,13 @@ class Submodule(util.IndexObject, Iterable, Traversable, RepoAliasMixin):
 
         # void our data not to delay invalid access
         self._clear_cache()
-        
+
         return self
-        
+
     def set_parent_commit(self, commit, check=True):
         """Set this instance to use the given commit whose tree is supposed to 
         contain the .gitmodules blob.
-        
+
         :param commit: Commit'ish reference pointing at the root_tree
         :param check: if True, relatively expensive checks will be performed to verify
             validity of the submodule.
@@ -726,30 +732,30 @@ class Submodule(util.IndexObject, Iterable, Traversable, RepoAliasMixin):
         if self.k_modules_file not in pctree:
             raise ValueError("Tree of commit %s did not contain the %s file" % (commit, self.k_modules_file))
         # END handle exceptions
-        
+
         prev_pc = self._parent_commit
         self._parent_commit = pcommit
-        
+
         if check:
             parser = self._config_parser(self.repo, self._parent_commit, read_only=True)
             if not parser.has_section(sm_section(self.name)):
                 self._parent_commit = prev_pc
-                raise ValueError("Submodule at path %r did not exist in parent commit %s" % (self.path, commit)) 
+                raise ValueError("Submodule at path %r did not exist in parent commit %s" % (self.path, commit))
             # END handle submodule did not exist
         # END handle checking mode
-        
+
         # update our sha, it could have changed
         self.binsha = pctree[self.path].binsha
-        
+
         self._clear_cache()
-        
+
         return self
-        
+
     @unbare_repo
     def config_writer(self, index=None, write=True):
         """:return: a config writer instance allowing you to read and write the data
         belonging to this submodule into the .gitmodules file.
-        
+
         :param index: if not None, an IndexFile instance which should be written.
             defaults to the index of the Submodule's parent repository.
         :param write: if True, the index will be written each time a configuration
@@ -765,11 +771,11 @@ class Submodule(util.IndexObject, Iterable, Traversable, RepoAliasMixin):
             writer.config._index = index
         writer.config._auto_write = write
         return writer
-        
+
     #} END edit interface
-    
+
     #{ Query Interface
-    
+
     @unbare_repo
     def module(self, repoType=None):
         """:return: Repository instance initialized from the repository at our submodule path
@@ -781,7 +787,7 @@ class Submodule(util.IndexObject, Iterable, Traversable, RepoAliasMixin):
         # late import to workaround circular dependencies
         module_path = self.abspath
         repoType = repoType or git.Repo
-        
+
         try:
             repo = repoType(module_path)
             if repo != self.repo:
@@ -792,7 +798,7 @@ class Submodule(util.IndexObject, Iterable, Traversable, RepoAliasMixin):
         else:
             raise InvalidGitRepositoryError("Repository at %r was not yet checked out" % module_path)
         # END handle exceptions
-        
+
     def module_exists(self):
         """:return: True if our module exists and is a valid git repository. See module() method"""
         try:
@@ -801,7 +807,7 @@ class Submodule(util.IndexObject, Iterable, Traversable, RepoAliasMixin):
         except Exception:
             return False
         # END handle exception
-    
+
     def exists(self):
         """
         :return: True if the submodule exists, False otherwise. Please note that
@@ -814,9 +820,9 @@ class Submodule(util.IndexObject, Iterable, Traversable, RepoAliasMixin):
             if hasattr(self, attr):
                 loc[attr] = getattr(self, attr)
             # END if we have the attribute cache
-        #END for each attr
+        # END for each attr
         self._clear_cache()
-        
+
         try:
             try:
                 self.path
@@ -831,38 +837,38 @@ class Submodule(util.IndexObject, Iterable, Traversable, RepoAliasMixin):
                 # END if we have a cache
             # END reapply each attribute
         # END handle object state consistency
-    
+
     @property
     def branch(self):
         """:return: The branch instance that we are to checkout
         :raise InvalidGitRepositoryError: if our module is not yet checked out"""
         return mkhead(self.module(), self._branch_path)
-    
+
     @property
     def branch_path(self):
         """
         :return: full (relative) path as string to the branch we would checkout
             from the remote and track"""
         return self._branch_path
-        
+
     @property
     def branch_name(self):
         """:return: the name of the branch, which is the shortest possible branch name"""
         # use an instance method, for this we create a temporary Head instance
         # which uses a repository that is available at least ( it makes no difference )
         return git.Head(self.repo, self._branch_path).name
-    
+
     @property
     def url(self):
         """:return: The url to the repository which our module-repository refers to"""
         return self._url
-    
+
     @property
     def parent_commit(self):
         """:return: Commit instance with the tree containing the .gitmodules file
         :note: will always point to the current head's commit if it was not set explicitly"""
         return self._parent_commit
-        
+
     @property
     def name(self):
         """:return: The name of this submodule. It is used to identify it within the 
@@ -873,7 +879,7 @@ class Submodule(util.IndexObject, Iterable, Traversable, RepoAliasMixin):
             easily
         """
         return self._name
-    
+
     def config_reader(self):
         """
         :return: ConfigReader instance which allows you to qurey the configuration values
@@ -883,17 +889,17 @@ class Submodule(util.IndexObject, Iterable, Traversable, RepoAliasMixin):
         :note: Should be cached by the caller and only kept as long as needed
         :raise IOError: If the .gitmodules file/blob could not be read"""
         return self._config_parser_constrained(read_only=True)
-        
+
     def children(self):
         """
         :return: IterableList(Submodule, ...) an iterable list of submodules instances
             which are children of this submodule or 0 if the submodule is not checked out"""
         return self._get_intermediate_items(self)
-        
+
     #} END query interface
-    
+
     #{ Iterable Interface
-    
+
     @classmethod
     def iter_items(cls, repo, parent_commit='HEAD'):
         """:return: iterator yielding Submodule instances available in the given repository"""
@@ -903,9 +909,9 @@ class Submodule(util.IndexObject, Iterable, Traversable, RepoAliasMixin):
         except IOError:
             raise StopIteration
         # END handle empty iterator
-        
+
         rt = pc.tree                                # root tree
-        
+
         for sms in parser.sections():
             n = sm_name(sms)
             p = parser.get_value(sms, 'path')
@@ -914,7 +920,7 @@ class Submodule(util.IndexObject, Iterable, Traversable, RepoAliasMixin):
             if parser.has_option(sms, cls.k_head_option):
                 b = parser.get_value(sms, cls.k_head_option)
             # END handle optional information
-            
+
             # get the binsha
             index = repo.index
             try:
@@ -925,18 +931,18 @@ class Submodule(util.IndexObject, Iterable, Traversable, RepoAliasMixin):
                     entry = index.entries[index.entry_key(p, 0)]
                     sm = Submodule(repo, entry.binsha, entry.mode, entry.path)
                 except KeyError:
-                    raise InvalidGitRepositoryError("Gitmodule path %r did not exist in revision of parent commit %s" % (p, parent_commit))
+                    raise InvalidGitRepositoryError(
+                        "Gitmodule path %r did not exist in revision of parent commit %s" % (p, parent_commit))
                 # END handle keyerror
             # END handle critical error
-            
+
             # fill in remaining info - saves time as it doesn't have to be parsed again
             sm._name = n
             sm._parent_commit = pc
             sm._branch_path = git.Head.to_full_path(b)
             sm._url = u
-            
+
             yield sm
         # END for each section
-    
-    #} END iterable interface
 
+    #} END iterable interface
diff --git a/git/objects/submodule/root.py b/git/objects/submodule/root.py
index 07fb793b..c6eee8af 100644
--- a/git/objects/submodule/root.py
+++ b/git/objects/submodule/root.py
@@ -4,8 +4,8 @@
 # the New BSD License: http://www.opensource.org/licenses/bsd-license.php
 from base import Submodule, UpdateProgress
 from util import (
-                    find_first_remote_branch
-                )
+    find_first_remote_branch
+)
 from git.exc import InvalidGitRepositoryError
 import git
 
@@ -15,10 +15,12 @@ __all__ = ["RootModule", "RootUpdateProgress"]
 
 
 class RootUpdateProgress(UpdateProgress):
+
     """Utility class which adds more opcodes to the UpdateProgress"""
-    REMOVE, PATHCHANGE, BRANCHCHANGE, URLCHANGE = [1 << x for x in range(UpdateProgress._num_op_codes, UpdateProgress._num_op_codes+4)]
-    _num_op_codes = UpdateProgress._num_op_codes+4
-    
+    REMOVE, PATHCHANGE, BRANCHCHANGE, URLCHANGE = [
+        1 << x for x in range(UpdateProgress._num_op_codes, UpdateProgress._num_op_codes + 4)]
+    _num_op_codes = UpdateProgress._num_op_codes + 4
+
     __slots__ = tuple()
 
 BEGIN = RootUpdateProgress.BEGIN
@@ -30,41 +32,41 @@ PATHCHANGE = RootUpdateProgress.PATHCHANGE
 
 
 class RootModule(Submodule):
+
     """A (virtual) Root of all submodules in the given repository. It can be used
     to more easily traverse all submodules of the master repository"""
-    
+
     __slots__ = tuple()
-    
+
     k_root_name = '__ROOT__'
-    
-    def __init__(self, repo, parent_commit = None):
+
+    def __init__(self, repo, parent_commit=None):
         super(RootModule, self).__init__(
-                                        repo, 
-                                        binsha = self.NULL_BIN_SHA, 
-                                        mode = self.k_default_mode, 
-                                        path = '', 
-                                        name = self.k_root_name, 
-                                        parent_commit = parent_commit or repo.head.commit,
-                                        url = '',
-                                        branch_path = git.Head.to_full_path(self.k_head_default)
-                                        )
-        
-    
+            repo,
+            binsha=self.NULL_BIN_SHA,
+            mode=self.k_default_mode,
+            path='',
+            name=self.k_root_name,
+            parent_commit=parent_commit or repo.head.commit,
+            url='',
+            branch_path=git.Head.to_full_path(self.k_head_default)
+        )
+
     def _clear_cache(self):
         """May not do anything"""
         pass
-    
-    #{ Interface 
-    
-    def update(self, previous_commit=None, recursive=True, force_remove=False, init=True, 
-                    to_latest_revision=False, progress=None, dry_run=False):
+
+    #{ Interface
+
+    def update(self, previous_commit=None, recursive=True, force_remove=False, init=True,
+               to_latest_revision=False, progress=None, dry_run=False):
         """Update the submodules of this repository to the current HEAD commit.
         This method behaves smartly by determining changes of the path of a submodules
         repository, next to changes to the to-be-checked-out commit or the branch to be 
         checked out. This works if the submodules ID does not change.
         Additionally it will detect addition and removal of submodules, which will be handled
         gracefully.
-        
+
         :param previous_commit: If set to a commit'ish, the commit we should use 
             as the previous commit the HEAD pointed to before it was set to the commit it points to now. 
             If None, it defaults to HEAD@{1} otherwise
@@ -83,17 +85,17 @@ class RootModule(Submodule):
         if self.repo.bare:
             raise InvalidGitRepositoryError("Cannot update submodules in bare repositories")
         # END handle bare
-        
+
         if progress is None:
             progress = RootUpdateProgress()
-        #END assure progress is set
-        
+        # END assure progress is set
+
         prefix = ''
         if dry_run:
             prefix = 'DRY-RUN: '
-        
+
         repo = self.repo
-        
+
         # SETUP BASE COMMIT
         ###################
         cur_commit = repo.head.commit
@@ -102,21 +104,20 @@ class RootModule(Submodule):
                 previous_commit = repo.commit(repo.head.log_entry(-1).oldhexsha)
                 if previous_commit.binsha == previous_commit.NULL_BIN_SHA:
                     raise IndexError
-                #END handle initial commit
+                # END handle initial commit
             except IndexError:
                 # in new repositories, there is no previous commit
                 previous_commit = cur_commit
-            #END exception handling
+            # END exception handling
         else:
-            previous_commit = repo.commit(previous_commit)   # obtain commit object 
+            previous_commit = repo.commit(previous_commit)   # obtain commit object
         # END handle previous commit
-        
-        
+
         psms = self.list_items(repo, parent_commit=previous_commit)
         sms = self.list_items(repo)
         spsms = set(psms)
         ssms = set(sms)
-        
+
         # HANDLE REMOVALS
         ###################
         rrsm = (spsms - ssms)
@@ -125,22 +126,22 @@ class RootModule(Submodule):
             op = REMOVE
             if i == 0:
                 op |= BEGIN
-            #END handle begin
-            
+            # END handle begin
+
             # fake it into thinking its at the current commit to allow deletion
             # of previous module. Trigger the cache to be updated before that
-            progress.update(op, i, len_rrsm, prefix+"Removing submodule %r at %s" % (rsm.name, rsm.abspath))
+            progress.update(op, i, len_rrsm, prefix + "Removing submodule %r at %s" % (rsm.name, rsm.abspath))
             rsm._parent_commit = repo.head.commit
             if not dry_run:
                 rsm.remove(configuration=False, module=True, force=force_remove)
-            #END handle dry-run
-            
-            if i == len_rrsm-1:
+            # END handle dry-run
+
+            if i == len_rrsm - 1:
                 op |= END
-            #END handle end
-            progress.update(op, i, len_rrsm, prefix+"Done removing submodule %r" % rsm.name)
+            # END handle end
+            progress.update(op, i, len_rrsm, prefix + "Done removing submodule %r" % rsm.name)
         # END for each removed submodule
-        
+
         # HANDLE PATH RENAMES
         #####################
         # url changes + branch changes
@@ -149,44 +150,48 @@ class RootModule(Submodule):
         for i, csm in enumerate(csms):
             psm = psms[csm.name]
             sm = sms[csm.name]
-            
-            #PATH CHANGES
+
+            # PATH CHANGES
             ##############
             if sm.path != psm.path and psm.module_exists():
-                progress.update(BEGIN|PATHCHANGE, i, len_csms, prefix+"Moving repository of submodule %r from %s to %s" % (sm.name, psm.abspath, sm.abspath))  
+                progress.update(BEGIN | PATHCHANGE, i, len_csms, prefix +
+                                "Moving repository of submodule %r from %s to %s" % (sm.name, psm.abspath, sm.abspath))
                 # move the module to the new path
                 if not dry_run:
                     psm.move(sm.path, module=True, configuration=False)
-                #END handle dry_run
-                progress.update(END|PATHCHANGE, i, len_csms, prefix+"Done moving repository of submodule %r" % sm.name)
+                # END handle dry_run
+                progress.update(
+                    END | PATHCHANGE, i, len_csms, prefix + "Done moving repository of submodule %r" % sm.name)
             # END handle path changes
-            
+
             if sm.module_exists():
                 # HANDLE URL CHANGE
                 ###################
                 if sm.url != psm.url:
                     # Add the new remote, remove the old one
-                    # This way, if the url just changes, the commits will not 
+                    # This way, if the url just changes, the commits will not
                     # have to be re-retrieved
                     nn = '__new_origin__'
                     smm = sm.module()
                     rmts = smm.remotes
-                    
+
                     # don't do anything if we already have the url we search in place
                     if len([r for r in rmts if r.url == sm.url]) == 0:
-                        progress.update(BEGIN|URLCHANGE, i, len_csms, prefix+"Changing url of submodule %r from %s to %s" % (sm.name, psm.url, sm.url))
-                        
+                        progress.update(BEGIN | URLCHANGE, i, len_csms, prefix +
+                                        "Changing url of submodule %r from %s to %s" % (sm.name, psm.url, sm.url))
+
                         if not dry_run:
                             assert nn not in [r.name for r in rmts]
                             smr = smm.create_remote(nn, sm.url)
                             smr.fetch(progress=progress)
-                            
+
                             # If we have a tracking branch, it should be available
                             # in the new remote as well.
                             if len([r for r in smr.refs if r.remote_head == sm.branch_name]) == 0:
-                                raise ValueError("Submodule branch named %r was not available in new submodule remote at %r" % (sm.branch_name, sm.url))
+                                raise ValueError(
+                                    "Submodule branch named %r was not available in new submodule remote at %r" % (sm.branch_name, sm.url))
                             # END head is not detached
-                            
+
                             # now delete the changed one
                             rmt_for_deletion = None
                             for remote in rmts:
@@ -195,36 +200,37 @@ class RootModule(Submodule):
                                     break
                                 # END if urls match
                             # END for each remote
-                            
-                            # if we didn't find a matching remote, but have exactly one, 
+
+                            # if we didn't find a matching remote, but have exactly one,
                             # we can safely use this one
                             if rmt_for_deletion is None:
                                 if len(rmts) == 1:
                                     rmt_for_deletion = rmts[0]
                                 else:
                                     # if we have not found any remote with the original url
-                                    # we may not have a name. This is a special case, 
+                                    # we may not have a name. This is a special case,
                                     # and its okay to fail here
                                     # Alternatively we could just generate a unique name and leave all
                                     # existing ones in place
-                                    raise InvalidGitRepositoryError("Couldn't find original remote-repo at url %r" % psm.url)
-                                #END handle one single remote
+                                    raise InvalidGitRepositoryError(
+                                        "Couldn't find original remote-repo at url %r" % psm.url)
+                                # END handle one single remote
                             # END handle check we found a remote
-                            
+
                             orig_name = rmt_for_deletion.name
                             smm.delete_remote(rmt_for_deletion)
                             # NOTE: Currently we leave tags from the deleted remotes
-                            # as well as separate tracking branches in the possibly totally 
-                            # changed repository ( someone could have changed the url to 
+                            # as well as separate tracking branches in the possibly totally
+                            # changed repository ( someone could have changed the url to
                             # another project ). At some point, one might want to clean
                             # it up, but the danger is high to remove stuff the user
                             # has added explicitly
-                            
+
                             # rename the new remote back to what it was
                             smr.rename(orig_name)
-                            
+
                             # early on, we verified that the our current tracking branch
-                            # exists in the remote. Now we have to assure that the 
+                            # exists in the remote. Now we have to assure that the
                             # sha we point to is still contained in the new remote
                             # tracking branch.
                             smsha = sm.binsha
@@ -236,28 +242,30 @@ class RootModule(Submodule):
                                     break
                                 # END traverse all commits in search for sha
                             # END for each commit
-                            
+
                             if not found:
                                 # adjust our internal binsha to use the one of the remote
                                 # this way, it will be checked out in the next step
-                                # This will change the submodule relative to us, so 
+                                # This will change the submodule relative to us, so
                                 # the user will be able to commit the change easily
                                 print >> sys.stderr, "WARNING: Current sha %s was not contained in the tracking branch at the new remote, setting it the the remote's tracking branch" % sm.hexsha
                                 sm.binsha = rref.commit.binsha
-                            #END reset binsha
-                            
-                            #NOTE: All checkout is performed by the base implementation of update
-                        #END handle dry_run
-                        progress.update(END|URLCHANGE, i, len_csms, prefix+"Done adjusting url of submodule %r" % (sm.name))
+                            # END reset binsha
+
+                            # NOTE: All checkout is performed by the base implementation of update
+                        # END handle dry_run
+                        progress.update(
+                            END | URLCHANGE, i, len_csms, prefix + "Done adjusting url of submodule %r" % (sm.name))
                     # END skip remote handling if new url already exists in module
                 # END handle url
-                
+
                 # HANDLE PATH CHANGES
                 #####################
                 if sm.branch_path != psm.branch_path:
-                    # finally, create a new tracking branch which tracks the 
+                    # finally, create a new tracking branch which tracks the
                     # new remote branch
-                    progress.update(BEGIN|BRANCHCHANGE, i, len_csms, prefix+"Changing branch of submodule %r from %s to %s" % (sm.name, psm.branch_path, sm.branch_path))
+                    progress.update(BEGIN | BRANCHCHANGE, i, len_csms, prefix +
+                                    "Changing branch of submodule %r from %s to %s" % (sm.name, psm.branch_path, sm.branch_path))
                     if not dry_run:
                         smm = sm.module()
                         smmr = smm.remotes
@@ -266,50 +274,51 @@ class RootModule(Submodule):
                         except OSError:
                             # ... or reuse the existing one
                             tbr = git.Head(smm, sm.branch_path)
-                        #END assure tracking branch exists
-                        
+                        # END assure tracking branch exists
+
                         tbr.set_tracking_branch(find_first_remote_branch(smmr, sm.branch_name))
                         # figure out whether the previous tracking branch contains
-                        # new commits compared to the other one, if not we can 
+                        # new commits compared to the other one, if not we can
                         # delete it.
                         try:
                             tbr = find_first_remote_branch(smmr, psm.branch_name)
                             if len(smm.git.cherry(tbr, psm.branch)) == 0:
                                 psm.branch.delete(smm, psm.branch)
-                            #END delete original tracking branch if there are no changes
+                            # END delete original tracking branch if there are no changes
                         except InvalidGitRepositoryError:
                             # ignore it if the previous branch couldn't be found in the
                             # current remotes, this just means we can't handle it
                             pass
                         # END exception handling
-                        
-                        #NOTE: All checkout is done in the base implementation of update
-                    #END handle dry_run
-                    
-                    progress.update(END|BRANCHCHANGE, i, len_csms, prefix+"Done changing branch of submodule %r" % sm.name)
-                #END handle branch
-            #END handle 
-        # END for each common submodule 
-        
+
+                        # NOTE: All checkout is done in the base implementation of update
+                    # END handle dry_run
+
+                    progress.update(
+                        END | BRANCHCHANGE, i, len_csms, prefix + "Done changing branch of submodule %r" % sm.name)
+                # END handle branch
+            # END handle
+        # END for each common submodule
+
         # FINALLY UPDATE ALL ACTUAL SUBMODULES
         ######################################
         for sm in sms:
             # update the submodule using the default method
-            sm.update(recursive=False, init=init, to_latest_revision=to_latest_revision, 
-                        progress=progress, dry_run=dry_run)
-            
-            # update recursively depth first - question is which inconsitent 
+            sm.update(recursive=False, init=init, to_latest_revision=to_latest_revision,
+                      progress=progress, dry_run=dry_run)
+
+            # update recursively depth first - question is which inconsitent
             # state will be better in case it fails somewhere. Defective branch
-            # or defective depth. The RootSubmodule type will never process itself, 
+            # or defective depth. The RootSubmodule type will never process itself,
             # which was done in the previous expression
             if recursive:
                 # the module would exist by now if we are not in dry_run mode
                 if sm.module_exists():
-                    type(self)(sm.module()).update( recursive=True, force_remove=force_remove, 
-                                                    init=init, to_latest_revision=to_latest_revision,
-                                                    progress=progress, dry_run=dry_run)
-                #END handle dry_run
-            #END handle recursive
+                    type(self)(sm.module()).update(recursive=True, force_remove=force_remove,
+                                                   init=init, to_latest_revision=to_latest_revision,
+                                                   progress=progress, dry_run=dry_run)
+                # END handle dry_run
+            # END handle recursive
         # END for each submodule to update
 
     def module(self):
diff --git a/git/objects/submodule/util.py b/git/objects/submodule/util.py
index 1c6ab483..552f353d 100644
--- a/git/objects/submodule/util.py
+++ b/git/objects/submodule/util.py
@@ -8,36 +8,42 @@ from git.config import GitConfigParser
 from StringIO import StringIO
 import weakref
 
-__all__ = ( 'sm_section', 'sm_name', 'mkhead', 'unbare_repo', 'find_first_remote_branch', 
-            'SubmoduleConfigParser')
+__all__ = ('sm_section', 'sm_name', 'mkhead', 'unbare_repo', 'find_first_remote_branch',
+           'SubmoduleConfigParser')
 
 #{ Utilities
 
+
 def sm_section(name):
     """:return: section title used in .gitmodules configuration file"""
     return 'submodule "%s"' % name
 
+
 def sm_name(section):
     """:return: name of the submodule as parsed from the section name"""
     section = section.strip()
     return section[11:-1]
-    
+
+
 def mkhead(repo, path):
     """:return: New branch/head instance"""
     return git.Head(repo, git.Head.to_full_path(path))
-    
+
+
 def unbare_repo(func):
     """Methods with this decorator raise InvalidGitRepositoryError if they 
     encounter a bare repository"""
+
     def wrapper(self, *args, **kwargs):
         if self.repo.bare:
             raise InvalidGitRepositoryError("Method '%s' cannot operate on bare repositories" % func.__name__)
-        #END bare method
+        # END bare method
         return func(self, *args, **kwargs)
     # END wrapper
     wrapper.__name__ = func.__name__
     return wrapper
-    
+
+
 def find_first_remote_branch(remotes, branch_name):
     """Find the remote branch matching the name of the given branch or raise InvalidGitRepositoryError"""
     for remote in remotes:
@@ -46,30 +52,31 @@ def find_first_remote_branch(remotes, branch_name):
         except IndexError:
             continue
         # END exception handling
-    #END for remote
+    # END for remote
     raise InvalidGitRepositoryError("Didn't find remote branch %r in any of the given remotes", branch_name)
-    
+
 #} END utilities
 
 
 #{ Classes
 
 class SubmoduleConfigParser(GitConfigParser):
+
     """
     Catches calls to _write, and updates the .gitmodules blob in the index
     with the new data, if we have written into a stream. Otherwise it will 
     add the local file to the index to make it correspond with the working tree.
     Additionally, the cache must be cleared
-    
+
     Please note that no mutating method will work in bare mode
     """
-    
+
     def __init__(self, *args, **kwargs):
         self._smref = None
         self._index = None
         self._auto_write = True
         super(SubmoduleConfigParser, self).__init__(*args, **kwargs)
-    
+
     #{ Interface
     def set_submodule(self, submodule):
         """Set this instance's submodule. It must be called before 
@@ -81,7 +88,7 @@ class SubmoduleConfigParser(GitConfigParser):
         assert self._smref is not None
         # should always have a file here
         assert not isinstance(self._file_or_files, StringIO)
-        
+
         sm = self._smref()
         if sm is not None:
             index = self._index
@@ -93,7 +100,7 @@ class SubmoduleConfigParser(GitConfigParser):
         # END handle weakref
 
     #} END interface
-    
+
     #{ Overridden Methods
     def write(self):
         rval = super(SubmoduleConfigParser, self).write()