Pick off the low hanging fruit

This fixes most of the import errors that came from using the
implicit relative imports that Python 2 supports.  This also fixes
the use of `xrange`, which has replaced `range` in Python 3.  The
same has happened for `izip`, which is also being aliased.

The octal number syntax changed in Python 3, so we are now
converting from strings using the `int` built-in function, which
will produce the same output across both versions of Python.

Author: kevin-brown

gitdb/__init__.py

@@ -32,7 +32,6 @@ def _init_externals():
 
 
 # default imports
-from db import *
-from base import *
-from stream import *
-
+from gitdb.base import *
+from gitdb.db import *
+from gitdb.stream import *

gitdb/base.py

@@ -3,15 +3,15 @@
 # This module is part of GitDB and is released under
 # the New BSD License: http://www.opensource.org/licenses/bsd-license.php
 """Module with basic data structures - they are designed to be lightweight and fast"""
-from util import (
-        bin_to_hex,
-        zlib
-    )
-
-from fun import (
-                    type_id_to_type_map,
-                    type_to_type_id_map
-                )
+from gitdb.util import (
+    bin_to_hex,
+    zlib
+)
+
+from gitdb.fun import (
+    type_id_to_type_map,
+    type_to_type_id_map
+)
 
 __all__ = ('OInfo', 'OPackInfo', 'ODeltaPackInfo',
             'OStream', 'OPackStream', 'ODeltaPackStream',

gitdb/db/__init__.py

@@ -3,10 +3,9 @@
 # This module is part of GitDB and is released under
 # the New BSD License: http://www.opensource.org/licenses/bsd-license.php
 
-from base import *
-from loose import *
-from mem import *
-from pack import *
-from git import *
-from ref import *
-
+from gitdb.db.base import *
+from gitdb.db.loose import *
+from gitdb.db.mem import *
+from gitdb.db.pack import *
+from gitdb.db.git import *
+from gitdb.db.ref import *

gitdb/db/base.py

@@ -20,6 +20,7 @@
 )
 
 from itertools import chain
+from functools import reduce
 
 
 __all__ = ('ObjectDBR', 'ObjectDBW', 'FileDBBase', 'CompoundDB', 'CachingDB')

gitdb/db/git.py

@@ -2,15 +2,15 @@
 #
 # This module is part of GitDB and is released under
 # the New BSD License: http://www.opensource.org/licenses/bsd-license.php
-from base import (
-                        CompoundDB, 
-                        ObjectDBW, 
-                        FileDBBase
-                    )
-
-from loose import LooseObjectDB
-from pack import PackedDB
-from ref import ReferenceDB
+from gitdb.db.base import (
+    CompoundDB,
+    ObjectDBW,
+    FileDBBase
+)
+
+from gitdb.db.loose import LooseObjectDB
+from gitdb.db.pack import PackedDB
+from gitdb.db.ref import ReferenceDB
 
 from gitdb.util import LazyMixin
 from gitdb.exc import (

gitdb/db/loose.py

@@ -2,11 +2,11 @@
 #
 # This module is part of GitDB and is released under
 # the New BSD License: http://www.opensource.org/licenses/bsd-license.php
-from base import (
-                        FileDBBase, 
-                        ObjectDBR, 
-                        ObjectDBW
-                )
+from gitdb.db.base import (
+    FileDBBase,
+    ObjectDBR,
+    ObjectDBW
+)
 
 
 from gitdb.exc import (
@@ -69,11 +69,11 @@ class LooseObjectDB(FileDBBase, ObjectDBR, ObjectDBW):
 
     # On windows we need to keep it writable, otherwise it cannot be removed
     # either
-    new_objects_mode = 0444
+    new_objects_mode = int("444", 8)
     if os.name == 'nt':
-        new_objects_mode = 0644
-            
-    
+        new_objects_mode = int("644", 8)
+
+
     def __init__(self, root_path):
         super(LooseObjectDB, self).__init__(root_path)
         self._hexsha_to_file = dict()
@@ -133,7 +133,7 @@ def _map_loose_object(self, sha):
         db_path = self.db_path(self.object_path(bin_to_hex(sha)))
         try:
             return file_contents_ro_filepath(db_path, flags=self._fd_open_flags)
-        except OSError,e:
+        except OSError as e:
             if e.errno != ENOENT:
                 # try again without noatime
                 try:

gitdb/db/mem.py

@@ -3,11 +3,11 @@
 # This module is part of GitDB and is released under
 # the New BSD License: http://www.opensource.org/licenses/bsd-license.php
 """Contains the MemoryDatabase implementation"""
-from loose import LooseObjectDB
-from base import (
-                        ObjectDBR, 
-                        ObjectDBW
-                    )
+from gitdb.db.loose import LooseObjectDB
+from gitdb.db.base import (
+    ObjectDBR,
+    ObjectDBW
+)
 
 from gitdb.base import (
     OStream,
@@ -19,7 +19,18 @@
     UnsupportedOperation
 )
 
-from cStringIO import StringIO
+from gitdb.stream import (
+    ZippedStoreShaWriter,
+    DecompressMemMapReader,
+)
+
+try:
+    from cStringIO import StringIO
+except ImportError:
+    try:
+        from StringIO import StringIO
+    except ImportError:
+        from io import StringIO
 
 __all__ = ("MemoryDB", )
 

gitdb/db/pack.py

@@ -3,11 +3,11 @@
 # This module is part of GitDB and is released under
 # the New BSD License: http://www.opensource.org/licenses/bsd-license.php
 """Module containing a database to deal with packs"""
-from base import (
-                        FileDBBase, 
-                        ObjectDBR, 
-                        CachingDB
-                )
+from gitdb.db.base import (
+    FileDBBase,
+    ObjectDBR,
+    CachingDB
+)
 
 from gitdb.util import LazyMixin
 
@@ -19,6 +19,8 @@
 
 from gitdb.pack import PackEntity
 
+from functools import reduce
+
 import os
 import glob
 
@@ -104,7 +106,7 @@ def sha_iter(self):
         for entity in self.entities():
             index = entity.index()
             sha_by_index = index.sha
-            for index in xrange(index.size()):
+            for index in range(index.size()):
                 yield sha_by_index(index)
             # END for each index
         # END for each entity

gitdb/db/ref.py

@@ -2,9 +2,9 @@
 #
 # This module is part of GitDB and is released under
 # the New BSD License: http://www.opensource.org/licenses/bsd-license.php
-from base import (
-                    CompoundDB,
-                )
+from gitdb.db.base import (
+    CompoundDB,
+)
 
 import os
 __all__ = ('ReferenceDB', )
@@ -33,7 +33,7 @@ def _update_dbs_from_ref_file(self):
         dbcls = self.ObjectDBCls
         if dbcls is None:
             # late import
-            from git import GitDB
+            from gitdb.db.git import GitDB
             dbcls = GitDB
         # END get db type
 
@@ -68,7 +68,7 @@ def _update_dbs_from_ref_file(self):
                     db.databases()
                 # END verification
                 self._dbs.append(db)
-            except Exception, e:
+            except Exception:
                 # ignore invalid paths or issues
                 pass
         # END for each path to add

gitdb/exc.py

@@ -3,7 +3,7 @@
 # This module is part of GitDB and is released under
 # the New BSD License: http://www.opensource.org/licenses/bsd-license.php
 """Module with common exceptions"""
-from util import to_hex_sha
+from gitdb.util import to_hex_sha
 
 class ODBError(Exception):
     """All errors thrown by the object database"""