Replaced ordered dict with standard version; used logging module

All performance tests still print to stderr, but do so in a py3 compatible way

Author: Byron

doc/source/conf.py

@@ -21,7 +21,6 @@
 # absolute, like shown here.
 #sys.path.append(os.path.abspath('.'))
 sys.path.insert(0, os.path.abspath('../..'))
-print sys.path
 
 # General configuration
 # ---------------------

git/cmd.py

@@ -6,6 +6,7 @@
 
 import os
 import sys
+import logging
 from util import (
     LazyMixin,
     stream_copy
@@ -22,6 +23,8 @@
                   'with_exceptions', 'as_process',
                   'output_stream')
 
+log = logging.getLogger('git.cmd')
+
 __all__ = ('Git', )
 
 
@@ -334,7 +337,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))
+            log.info(' '.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 +392,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))
+                log.info("%s -> %d; stdout: '%s'; stderr: '%s'", cmdstr, status, stdout_value, stderr_value)
             elif stdout_value:
-                print("%s -> %d; stdout: '%s'" % (cmdstr, status, stdout_value))
+                log.info("%s -> %d; stdout: '%s'", cmdstr, status, stdout_value)
             else:
-                print("%s -> %d" % (cmdstr, status))
+                log.info("%s -> %d", cmdstr, status)
         # END handle debug printing
 
         if with_exceptions and status != 0:

git/config.py

@@ -9,13 +9,17 @@
 import re
 import ConfigParser as cp
 import inspect
+import logging
 
 from git.odict import OrderedDict
 from git.util import LockFile
 
 __all__ = ('GitConfigParser', 'SectionConstraint')
 
 
+log = logging.getLogger('git.config')
+
+
 class MetaParserBuilder(type):
 
     """Utlity class wrapping base-class methods into decorators that assure read-only properties"""
@@ -186,8 +190,8 @@ def __del__(self):
         try:
             try:
                 self.write()
-            except IOError as e:
-                print("Exception during destruction of GitConfigParser: %s" % str(e))
+            except IOError:
+                log.error("Exception during destruction of GitConfigParser", exc_info=True)
         finally:
             self._lock._release_lock()
 

git/objects/commit.py

@@ -31,7 +31,9 @@
     altzone
 )
 import os
-import sys
+import logging
+
+log = logging.getLogger('git.objects.commit')
 
 __all__ = ('Commit', )
 
@@ -473,16 +475,16 @@ def _deserialize(self, stream):
         try:
             self.author.name = self.author.name.decode(self.encoding)
         except UnicodeDecodeError:
-            print >> sys.stderr, "Failed to decode author name '%s' using encoding %s" % (
-                self.author.name, self.encoding)
+            log.error("Failed to decode author name '%s' using encoding %s", self.author.name, self.encoding,
+                      exc_info=True)
         # END handle author's encoding
 
         # decode committer name
         try:
             self.committer.name = self.committer.name.decode(self.encoding)
         except UnicodeDecodeError:
-            print >> sys.stderr, "Failed to decode committer name '%s' using encoding %s" % (
-                self.committer.name, self.encoding)
+            log.error("Failed to decode committer name '%s' using encoding %s", self.committer.name, self.encoding,
+                      exc_info=True)
         # END handle author's encoding
 
         # a stream from our data simply gives us the plain message
@@ -491,7 +493,7 @@ def _deserialize(self, stream):
         try:
             self.message = self.message.decode(self.encoding)
         except UnicodeDecodeError:
-            print >> sys.stderr, "Failed to decode message '%s' using encoding %s" % (self.message, self.encoding)
+            log.error("Failed to decode message '%s' using encoding %s", self.message, self.encoding, exc_info=True)
         # END exception handling
         return self
 

git/objects/submodule/base.py

@@ -27,11 +27,14 @@
 import git
 
 import os
-import sys
+import logging
 
 __all__ = ["Submodule", "UpdateProgress"]
 
 
+log = logging.getLogger('git.objects.submodule.base')
+
+
 class UpdateProgress(RemoteProgress):
 
     """Class providing detailed progress information to the caller who should
@@ -408,7 +411,7 @@ def update(self, recursive=False, init=True, to_latest_revision=False, progress=
                     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
+                    log.warn("Failed to checkout tracking branch %s", self.branch_path)
                 # END handle tracking branch
 
                 # NOTE: Have to write the repo config file as well, otherwise
@@ -437,11 +440,10 @@ def update(self, recursive=False, init=True, to_latest_revision=False, progress=
                     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)
+                    log.error("%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
+                log.error("%s there was no local tracking branch", msg_base)
             # END handle detached head
         # END handle to_latest_revision option
 

git/objects/submodule/root.py

@@ -5,10 +5,12 @@
 from git.exc import InvalidGitRepositoryError
 import git
 
-import sys
+import logging
 
 __all__ = ["RootModule", "RootUpdateProgress"]
 
+log = logging.getLogger('git.objects.submodule.root')
+
 
 class RootUpdateProgress(UpdateProgress):
 
@@ -247,8 +249,8 @@ def update(self, previous_commit=None, recursive=True, force_remove=False, init=
                                 # 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
+                                log.warn("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