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.

1 files changed, 25 insertions, 18 deletions

diff --git a/gitdb/stream.py b/gitdb/stream.py
index b21c39c..52b54af 100644
--- a/gitdb/stream.py
+++ b/gitdb/stream.py
@@ -3,28 +3,35 @@
 # This module is part of GitDB and is released under
 # the New BSD License: http://www.opensource.org/licenses/bsd-license.php
 
-from cStringIO import StringIO
+try:
+    from cStringIO import StringIO
+except ImportError:
+    try:
+        from StringIO import StringIO
+    except ImportError:
+        from io import StringIO
+
 import errno
 import mmap
 import os
 
-from fun import (
-                    msb_size,
-                    stream_copy, 
-                    apply_delta_data,
-                    connect_deltas,
-                    DeltaChunkList,
-                    delta_types
-                )
-
-from util import (
-        allocate_memory,
-        LazyMixin,
-        make_sha,
-        write, 
-        close,
-        zlib
-    )
+from gitdb.fun import (
+    msb_size,
+    stream_copy,
+    apply_delta_data,
+    connect_deltas,
+    DeltaChunkList,
+    delta_types
+)
+
+from gitdb.util import (
+    allocate_memory,
+    LazyMixin,
+    make_sha,
+    write,
+    close,
+    zlib
+)
 
 has_perf_mod = False
 try: