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

2 files changed, 14 insertions, 8 deletions

diff --git a/git/objects/submodule/base.py b/git/objects/submodule/base.py
index e3d58077..6951fd63 100644
--- a/git/objects/submodule/base.py
+++ b/git/objects/submodule/base.py
@@ -28,7 +28,6 @@ import git
 
 import os
 import sys
-import time
 
 __all__ = ["Submodule", "UpdateProgress"]
 
@@ -140,7 +139,8 @@ class Submodule(util.IndexObject, Iterable, Traversable):
         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):
@@ -236,7 +236,7 @@ class Submodule(util.IndexObject, Iterable, Traversable):
 
         # assure we never put backslashes into the url, as some operating systems
         # like it ...
-        if url != None:
+        if url is not None:
             url = to_native_path_linux(url)
         # END assure url correctness
 
@@ -449,7 +449,8 @@ class Submodule(util.IndexObject, Iterable, Traversable):
         # 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))
+                            "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
@@ -638,7 +639,8 @@ class Submodule(util.IndexObject, Iterable, Traversable):
                 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)
+                        "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
diff --git a/git/objects/submodule/root.py b/git/objects/submodule/root.py
index f68f7567..871cc21c 100644
--- a/git/objects/submodule/root.py
+++ b/git/objects/submodule/root.py
@@ -186,7 +186,9 @@ class RootModule(Submodule):
                             # 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))
+                                    "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
@@ -245,7 +247,8 @@ class RootModule(Submodule):
                                 # this way, it will be checked out in the next step
                                 # 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
+                                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
 
@@ -262,7 +265,8 @@ class RootModule(Submodule):
                     # 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))
+                                    "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