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

Author: Byron

README.md

@@ -66,7 +66,7 @@ New BSD License.  See the LICENSE file.
 ### DEVELOPMENT STATUS
 
 [![Build Status](https://travis-ci.org/gitpython-developers/GitPython.svg?branch=0.3)](https://travis-ci.org/gitpython-developers/GitPython)
-[![Coverage Status](https://coveralls.io/repos/gitpython-developers/GitPython/badge.png)](https://coveralls.io/r/gitpython-developers/GitPython)
+[![Coverage Status](https://coveralls.io/repos/gitpython-developers/GitPython/badge.png?branch=0.3)](https://coveralls.io/r/gitpython-developers/GitPython?branch=0.3)
 [![Documentation Status](https://readthedocs.org/projects/gitpython/badge/?version=stable)](https://readthedocs.org/projects/gitpython/?badge=stable)
 
 

VERSION

@@ -1 +1 @@
-0.3.2.1
+0.3.3

doc/source/changes.rst

@@ -5,6 +5,9 @@ Changelog
 0.3.3
 =====
 * When fetching, pulling or pushing, and an error occours, it will not be reported on stdout anymore. However, if there is a fatal error, it will still result in a GitCommandError to be thrown. This goes hand in hand with improved fetch result parsing.
+* Code Cleanup (in preparation for python 3 support)
+  * Applied autopep8 and cleaned up code
+  * Using python logging module instead of print statments to signal certain kinds of errors
 
 0.3.2.1
 =======

git/cmd.py

@@ -334,7 +334,7 @@ def execute(self, command,
            If you add additional keyword arguments to the signature of this method,
            you must update the execute_kwargs tuple housed in this module."""
         if self.GIT_PYTHON_TRACE and (self.GIT_PYTHON_TRACE != 'full' or as_process):
-            print ' '.join(command)
+            print(' '.join(command))
 
         # Allow the user to have the command executed in their working dir.
         if with_keep_cwd or self._working_dir is None:
@@ -389,11 +389,11 @@ def execute(self, command,
         if self.GIT_PYTHON_TRACE == 'full':
             cmdstr = " ".join(command)
             if stderr_value:
-                print "%s -> %d; stdout: '%s'; stderr: '%s'" % (cmdstr, status, stdout_value, stderr_value)
+                print("%s -> %d; stdout: '%s'; stderr: '%s'" % (cmdstr, status, stdout_value, stderr_value))
             elif stdout_value:
-                print "%s -> %d; stdout: '%s'" % (cmdstr, status, stdout_value)
+                print("%s -> %d; stdout: '%s'" % (cmdstr, status, stdout_value))
             else:
-                print "%s -> %d" % (cmdstr, status)
+                print("%s -> %d" % (cmdstr, status))
         # END handle debug printing
 
         if with_exceptions and status != 0:
@@ -522,14 +522,16 @@ def make_call():
                         raise
                     # END handle overridden variable
                     type(self).GIT_PYTHON_GIT_EXECUTABLE = self.git_exec_name_win
-                    call = [self.GIT_PYTHON_GIT_EXECUTABLE] + list(args)
 
                     try:
                         return self.execute(make_call(), **_kwargs)
                     finally:
                         import warnings
-                        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
+                        msg = "WARNING: Automatically switched to use git.cmd as git executable"
+                        msg += ", which reduces performance by ~70%."
+                        msg += "Its recommended to put git.exe into the PATH or to "
+                        msg += "set the %s " % self._git_exec_env_var
+                        msg += "environment variable to the executable's location"
                         warnings.warn(msg)
                     # END print of warning
                 # END catch first failure

git/config.py

@@ -7,10 +7,8 @@
 configuration files"""
 
 import re
-import os
 import ConfigParser as cp
 import inspect
-import cStringIO
 
 from git.odict import OrderedDict
 from git.util import LockFile
@@ -188,8 +186,8 @@ def __del__(self):
         try:
             try:
                 self.write()
-            except IOError, e:
-                print "Exception during destruction of GitConfigParser: %s" % str(e)
+            except IOError as e:
+                print("Exception during destruction of GitConfigParser: %s" % str(e))
         finally:
             self._lock._release_lock()
 
@@ -287,7 +285,7 @@ def read(self):
                 try:
                     fp = open(file_object)
                     close_fp = True
-                except IOError, e:
+                except IOError:
                     continue
             # END fp handling
 

git/diff.py

@@ -7,7 +7,6 @@
 import re
 from objects.blob import Blob
 from objects.util import mode_str_to_int
-from exc import GitCommandError
 
 from gitdb.util import hex_to_bin
 
@@ -106,7 +105,7 @@ def diff(self, other=Index, paths=None, create_patch=False, **kwargs):
             diff_method = Diff._index_from_patch_format
         index = diff_method(self.repo, proc.stdout)
 
-        status = proc.wait()
+        proc.wait()
         return index
 
 
@@ -321,7 +320,7 @@ def _index_from_raw_format(cls, repo, stream):
             modify, delete and add files
         :return: git.DiffIndex"""
         # handles
-        # :100644 100644 6870991011cc8d9853a7a8a6f02061512c6a8190 37c5e30c879213e9ae83b21e9d11e55fc20c54b7 M    .gitignore
+        # :100644 100644 687099101... 37c5e30c8... M    .gitignore
         index = DiffIndex()
         for line in stream:
             if not line.startswith(":"):

git/ext/gitdb

@@ -1,4 +1,6 @@
 """Initialize the index package"""
 
-from base import *
-from typ import *
+from __future__ import absolute_import
+
+from .base import *
+from .typ import *

git/index/__init__.py

@@ -24,7 +24,6 @@
     git_working_dir
 )
 
-import git.objects
 import git.diff as diff
 
 from git.exc import (
@@ -43,13 +42,11 @@
 from git.objects.util import Serializable
 
 from git.util import (
-    IndexFileSHA1Writer,
     LazyMixin,
     LockedFD,
     join_path_native,
     file_contents_ro,
     to_native_path_linux,
-    to_native_path
 )
 
 from fun import (
@@ -418,9 +415,6 @@ def iter_blobs(self, predicate=lambda t: True):
             iterator. A default filter, the BlobFilter, allows you to yield blobs
             only if they match a given list of paths. """
         for entry in self.entries.itervalues():
-            # TODO: is it necessary to convert the mode ? We did that when adding
-            # it to the index, right ?
-            mode = stat_mode_to_index_mode(entry.mode)
             blob = entry.to_blob(self.repo)
             blob.size = entry.size
             output = (entry.stage, blob)
@@ -602,7 +596,7 @@ def _entries_for_paths(self, paths, path_rewriter, fprogress, entries):
     def add(self, items, force=True, fprogress=lambda *args: None, path_rewriter=None,
             write=True):
         """Add files from the working tree, specific blobs or BaseIndexEntries
-        to the index. 
+        to the index.
 
         :param items:
             Multiple types of items are supported, types can be mixed within one call.
@@ -630,7 +624,7 @@ def add(self, items, force=True, fprogress=lambda *args: None, path_rewriter=Non
                 must be a path relative to our repository.
 
                 If their sha is null ( 40*0 ), their path must exist in the file system
-                relative to the git repository as an object will be created from 
+                relative to the git repository as an object will be created from
                 the data at the path.
                 The handling now very much equals the way string paths are processed, except that
                 the mode you have set will be kept. This allows you to create symlinks
@@ -892,7 +886,8 @@ def commit(self, message, parent_commits=None, head=True, author=None, committer
         :return:
             Commit object representing the new commit"""
         tree = self.write_tree()
-        return Commit.create_from_tree(self.repo, tree, message, parent_commits, head, author=author, committer=committer)
+        return Commit.create_from_tree(self.repo, tree, message, parent_commits,
+                                       head, author=author, committer=committer)
 
     @classmethod
     def _flush_stdin_and_wait(cls, proc, ignore_stdout=False):
@@ -995,7 +990,8 @@ def handle_stderr(proc, iter_checked_out_files):
             if failed_files:
                 valid_files = list(set(iter_checked_out_files) - set(failed_files))
                 raise CheckoutError(
-                    "Some files could not be checked out from the index due to local modifications", failed_files, valid_files, failed_reasons)
+                    "Some files could not be checked out from the index due to local modifications",
+                    failed_files, valid_files, failed_reasons)
         # END stderr handler
 
         if paths is None:

git/index/base.py

@@ -5,7 +5,6 @@
     S_IFDIR,
     S_IFLNK,
     S_ISLNK,
-    S_IFDIR,
     S_ISDIR,
     S_IFMT,
     S_IFREG,
@@ -146,7 +145,7 @@ def read_cache(stream):
         path = read(path_size)
 
         real_size = ((tell() - beginoffset + 8) & ~7)
-        data = read((beginoffset + real_size) - tell())
+        read((beginoffset + real_size) - tell())
         entry = IndexEntry((mode, sha, flags, path, ctime, mtime, dev, ino, uid, gid, size))
         # entry_key would be the method to use, but we safe the effort
         entries[(path, entry.stage)] = entry
@@ -160,8 +159,8 @@ def read_cache(stream):
     # 4 bytes length of chunk
     # repeated 0 - N times
     extension_data = stream.read(~0)
-    assert len(extension_data) > 19, "Index Footer was not at least a sha on content as it was only %i bytes in size" % len(
-        extension_data)
+    assert len(extension_data) > 19, "Index Footer was not at least a sha on content as it was only %i bytes in size"\
+                                     % len(extension_data)
 
     content_sha = extension_data[-20:]
 
@@ -265,7 +264,7 @@ def aggressive_tree_merge(odb, tree_shas):
                     # it exists in all branches, if it was changed in both
                     # its a conflict, otherwise we take the changed version
                     # This should be the most common branch, so it comes first
-                    if( base[0] != ours[0] and base[0] != theirs[0] and ours[0] != theirs[0] ) or \
+                    if(base[0] != ours[0] and base[0] != theirs[0] and ours[0] != theirs[0]) or \
                             (base[1] != ours[1] and base[1] != theirs[1] and ours[1] != theirs[1]):
                         # changed by both
                         out_append(_tree_entry_to_baseindexentry(base, 1))