initial set of adjustments to make (most) imports work.

More to come, especially when it's about strings

Author: Byron

Diff for: README.md

@@ -83,10 +83,6 @@ In short, I want to make a new release of 0.3 with all contributions and fixes i
 
 The goals I have set for myself, in order, are as follows, all on branch 0.3.
 
-* bring the test suite back online to work with the most commonly used git version
-* merge all open pull requests, may there be a test-case or not, back. If something breaks, fix it if possible or let the contributor know
-* conform git-python's structure and toolchain to the one used in my [other OSS projects](https://github.com/Byron/bcore)
-* evaluate all open issues and close them if possible
 * evaluate python 3.3 compatibility and establish it if possible
 
 While that is happening, I will try hard to foster community around the project. This means being more responsive on the mailing list and in issues, as well as setting up clear guide lines about the [contribution](http://rfc.zeromq.org/spec:22) and maintenance workflow.

Diff for: doc/source/changes.rst

@@ -6,6 +6,7 @@ Changelog
 =====
 * 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
 

Diff for: git/cmd.py

@@ -7,18 +7,20 @@
 import os
 import sys
 import logging
-from util import (
-    LazyMixin,
-    stream_copy
-)
-from exc import GitCommandError
-
 from subprocess import (
     call,
     Popen,
     PIPE
 )
 
+
+from .util import (
+    LazyMixin,
+    stream_copy
+)
+from .exc import GitCommandError
+
+
 execute_kwargs = ('istream', 'with_keep_cwd', 'with_extended_output',
                   'with_exceptions', 'as_process',
                   'output_stream')

Diff for: git/compat.py

@@ -0,0 +1,19 @@
+#-*-coding:utf-8-*-
+# config.py
+# Copyright (C) 2008, 2009 Michael Trier ([email protected]) and contributors
+#
+# This module is part of GitPython and is released under
+# the BSD License: http://www.opensource.org/licenses/bsd-license.php
+"""utilities to help provide compatibility with python 3"""
+
+from gitdb.utils.compat import (  # noqa
+    PY3,
+    xrange,
+    MAXSIZE,
+    izip,
+)
+
+from gitdb.utils.encoding import (   # noqa
+    string_types,
+    text_type
+)

Diff for: git/config.py

@@ -7,7 +7,11 @@
 configuration files"""
 
 import re
-import ConfigParser as cp
+try:
+    import ConfigParser as cp
+except ImportError:
+    # PY3
+    import configparser as cp
 import inspect
 import logging
 

Diff for: git/db.py

@@ -1,21 +1,20 @@
 """Module with our own gitdb implementation - it uses the git command"""
-from exc import (
-    GitCommandError,
-    BadObject
-)
-
 from gitdb.base import (
     OInfo,
     OStream
 )
-
 from gitdb.util import (
     bin_to_hex,
     hex_to_bin
 )
 from gitdb.db import GitDB
 from gitdb.db import LooseObjectDB
 
+from .exc import (
+    GitCommandError,
+    BadObject
+)
+
 
 __all__ = ('GitCmdObjectDB', 'GitDB')
 

Diff for: git/diff.py

@@ -3,13 +3,13 @@
 #
 # This module is part of GitPython and is released under
 # the BSD License: http://www.opensource.org/licenses/bsd-license.php
-
 import re
-from objects.blob import Blob
-from objects.util import mode_str_to_int
 
 from gitdb.util import hex_to_bin
 
+from .objects.blob import Blob
+from .objects.util import mode_str_to_int
+
 
 __all__ = ('Diffable', 'DiffIndex', 'Diff')
 

Diff for: git/index/base.py

@@ -8,24 +8,23 @@
 import sys
 import subprocess
 import glob
-from cStringIO import StringIO
+from io import StringIO
 
 from stat import S_ISLNK
 
-from typ import (
+from .typ import (
     BaseIndexEntry,
     IndexEntry,
 )
 
-from util import (
+from .util import (
     TemporaryFileSwap,
     post_clear_cache,
     default_index,
     git_working_dir
 )
 
 import git.diff as diff
-
 from git.exc import (
     GitCommandError,
     CheckoutError
@@ -40,6 +39,7 @@
 )
 
 from git.objects.util import Serializable
+from git.compat import izip
 
 from git.util import (
     LazyMixin,
@@ -49,7 +49,7 @@
     to_native_path_linux,
 )
 
-from fun import (
+from .fun import (
     entry_key,
     write_cache,
     read_cache,
@@ -62,7 +62,6 @@
 from gitdb.base import IStream
 from gitdb.db import MemoryDB
 from gitdb.util import to_bin_sha
-from itertools import izip
 
 __all__ = ('IndexFile', 'CheckoutError')
 

Diff for: git/index/fun.py

@@ -12,7 +12,7 @@
 
 S_IFGITLINK = S_IFLNK | S_IFDIR     # a submodule
 
-from cStringIO import StringIO
+from io import StringIO
 
 from git.util import IndexFileSHA1Writer
 from git.exc import UnmergedEntriesError
@@ -22,15 +22,15 @@
     traverse_trees_recursive
 )
 
-from typ import (
+from .typ import (
     BaseIndexEntry,
     IndexEntry,
     CE_NAMEMASK,
     CE_STAGESHIFT
 )
 CE_NAMEMASK_INV = ~CE_NAMEMASK
 
-from util import (
+from .util import (
     pack,
     unpack
 )
@@ -49,7 +49,7 @@ def stat_mode_to_index_mode(mode):
         return S_IFLNK
     if S_ISDIR(mode) or S_IFMT(mode) == S_IFGITLINK:    # submodules
         return S_IFGITLINK
-    return S_IFREG | 0644 | (mode & 0100)       # blobs with or without executable bit
+    return S_IFREG | 0o644 | (mode & 0o100)       # blobs with or without executable bit
 
 
 def write_cache(entries, stream, extension_data=None, ShaStreamCls=IndexFileSHA1Writer):

Diff for: git/index/typ.py

@@ -1,15 +1,14 @@
 """Module with additional types used by the index"""
 
-from util import (
+from binascii import b2a_hex
+
+from .util import (
     pack,
     unpack
 )
+from git.objects import Blob
 
-from binascii import (
-    b2a_hex,
-)
 
-from git.objects import Blob
 __all__ = ('BlobFilter', 'BaseIndexEntry', 'IndexEntry')
 
 #{ Invariants

Diff for: git/objects/__init__.py

@@ -7,9 +7,10 @@
 from .base import *
 # Fix import dependency - add IndexObject to the util module, so that it can be
 # imported by the submodule.base
-from .submodule import util
-util.IndexObject = IndexObject
-util.Object = Object
+from .submodule import util as smutil
+smutil.IndexObject = IndexObject
+smutil.Object = Object
+del(smutil)
 from .submodule.base import *
 from .submodule.root import *
 

Diff for: git/objects/base.py

@@ -3,8 +3,8 @@
 #
 # This module is part of GitPython and is released under
 # the BSD License: http://www.opensource.org/licenses/bsd-license.php
+from .util import get_object_type_by_name
 from git.util import LazyMixin, join_path_native, stream_copy
-from util import get_object_type_by_name
 from gitdb.util import (
     bin_to_hex,
     basename

Diff for: git/objects/blob.py

@@ -3,9 +3,8 @@
 #
 # This module is part of GitPython and is released under
 # the BSD License: http://www.opensource.org/licenses/bsd-license.php
-
 from mimetypes import guess_type
-import base
+from . import base
 
 __all__ = ('Blob', )
 

Diff for: git/objects/commit.py

@@ -4,33 +4,32 @@
 # This module is part of GitPython and is released under
 # the BSD License: http://www.opensource.org/licenses/bsd-license.php
 
+from gitdb import IStream
+from gitdb.util import hex_to_bin
 from git.util import (
     Actor,
     Iterable,
     Stats,
     finalize_process
 )
 from git.diff import Diffable
-from tree import Tree
-from gitdb import IStream
-from cStringIO import StringIO
 
-import base
-from gitdb.util import (
-    hex_to_bin
-)
-from util import (
+from .tree import Tree
+from . import base
+from .util import (
     Traversable,
     Serializable,
     parse_date,
     altz_to_utctz_str,
     parse_actor_and_date
 )
+
 from time import (
     time,
     altzone
 )
 import os
+from io import StringIO
 import logging
 
 log = logging.getLogger('git.objects.commit')

Diff for: git/objects/submodule/base.py

@@ -1,5 +1,5 @@
-import util
-from util import (
+from . import util
+from .util import (
     mkhead,
     sm_name,
     sm_section,
@@ -8,7 +8,7 @@
     find_first_remote_branch
 )
 from git.objects.util import Traversable
-from StringIO import StringIO                   # need a dict to set bloody .name field
+from io import StringIO                   # need a dict to set bloody .name field
 from git.util import (
     Iterable,
     join_path_native,

Diff for: git/objects/submodule/root.py

@@ -1,5 +1,8 @@
-from base import Submodule, UpdateProgress
-from util import (
+from .base import (
+    Submodule,
+    UpdateProgress
+)
+from .util import (
     find_first_remote_branch
 )
 from git.exc import InvalidGitRepositoryError

Diff for: git/objects/submodule/util.py

@@ -1,7 +1,7 @@
 import git
 from git.exc import InvalidGitRepositoryError
 from git.config import GitConfigParser
-from StringIO import StringIO
+from io import StringIO
 import weakref
 
 __all__ = ('sm_section', 'sm_name', 'mkhead', 'unbare_repo', 'find_first_remote_branch',

Diff for: git/objects/tag.py

@@ -4,12 +4,12 @@
 # This module is part of GitPython and is released under
 # the BSD License: http://www.opensource.org/licenses/bsd-license.php
 """ Module containing all object based types. """
-import base
-from gitdb.util import hex_to_bin
-from util import (
+from . import base
+from .util import (
     get_object_type_by_name,
     parse_actor_and_date
 )
+from gitdb.util import hex_to_bin
 
 __all__ = ("TagObject", )
 

Diff for: git/objects/tree.py

@@ -3,22 +3,20 @@
 #
 # This module is part of GitPython and is released under
 # the BSD License: http://www.opensource.org/licenses/bsd-license.php
-import util
-from base import IndexObject
 from git.util import join_path
-from blob import Blob
-from submodule.base import Submodule
 import git.diff as diff
+from gitdb.util import to_bin_sha
 
-from fun import (
+from . import util
+from .base import IndexObject
+from .blob import Blob
+from .submodule.base import Submodule
+
+from .fun import (
     tree_entries_from_data,
     tree_to_stream
 )
 
-from gitdb.util import (
-    to_bin_sha,
-)
-
 __all__ = ("TreeModifier", "Tree")