Fixed all applicable lint issues

26 files changed, 75 insertions, 81 deletions

diff --git a/gitdb/db/base.py b/gitdb/db/base.py
index 53a94d2..c534705 100644
--- a/gitdb/db/base.py
+++ b/gitdb/db/base.py
@@ -22,7 +22,6 @@ from async import (
 from itertools import chain
 from functools import reduce
 
-import sys
 
 
 __all__ = ('ObjectDBR', 'ObjectDBW', 'FileDBBase', 'CompoundDB', 'CachingDB')
@@ -206,7 +205,6 @@ def _databases_recursive(database, output):
     """Fill output list with database from db, in order. Deals with Loose, Packed
     and compound databases."""
     if isinstance(database, CompoundDB):
-        compounds = list()
         dbs = database.databases()
         output.extend(db for db in dbs if not isinstance(db, CompoundDB))
         for cdb in (db for db in dbs if isinstance(db, CompoundDB)):
diff --git a/gitdb/db/git.py b/gitdb/db/git.py
index 5c74a20..d22e3f1 100644
--- a/gitdb/db/git.py
+++ b/gitdb/db/git.py
@@ -12,12 +12,7 @@ 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 (
-    InvalidDBRoot,
-    BadObject,
-    AmbiguousObjectName
-)
+from gitdb.exc import InvalidDBRoot
 
 import os
 
diff --git a/gitdb/db/loose.py b/gitdb/db/loose.py
index 63f9635..3abdaa9 100644
--- a/gitdb/db/loose.py
+++ b/gitdb/db/loose.py
@@ -10,7 +10,6 @@ from gitdb.db.base import (
 
 
 from gitdb.exc import (
-    InvalidDBRoot,
     BadObject,
     AmbiguousObjectName
 )
@@ -55,8 +54,6 @@ from gitdb.utils.compat import MAXSIZE
 from gitdb.utils.encoding import force_bytes
 
 import tempfile
-import mmap
-import sys
 import os
 
 
@@ -149,11 +146,6 @@ class LooseObjectDB(FileDBBase, ObjectDBR, ObjectDBW):
                 raise BadObject(sha)
             # END handle error
         # END exception handling
-        try:
-            return mmap.mmap(fd, 0, access=mmap.ACCESS_READ)
-        finally:
-            os.close(fd)
-        # END assure file is closed
 
     def set_ostream(self, stream):
         """:raise TypeError: if the stream does not support the Sha1Writer interface"""
diff --git a/gitdb/db/pack.py b/gitdb/db/pack.py
index b95bfed..4d0a7f8 100644
--- a/gitdb/db/pack.py
+++ b/gitdb/db/pack.py
@@ -103,7 +103,6 @@ class PackedDB(FileDBBase, ObjectDBR, CachingDB, LazyMixin):
         return entity.stream_at_index(index)
 
     def sha_iter(self):
-        sha_list = list()
         for entity in self.entities():
             index = entity.index()
             sha_by_index = index.sha
diff --git a/gitdb/db/ref.py b/gitdb/db/ref.py
index 748f7c1..d989126 100644
--- a/gitdb/db/ref.py
+++ b/gitdb/db/ref.py
@@ -6,7 +6,6 @@ from gitdb.db.base import (
     CompoundDB,
 )
 
-import os
 __all__ = ('ReferenceDB', )
 
 class ReferenceDB(CompoundDB):
diff --git a/gitdb/ext/smmap b/gitdb/ext/smmap
-Subproject f53ddc686c0d226b2c69cc3732406dd3796932c
+Subproject 28fd45e0a7018f166820a5e00fce2ccb05ebdb6
diff --git a/gitdb/fun.py b/gitdb/fun.py
index 22e56dd..80f01e6 100644
--- a/gitdb/fun.py
+++ b/gitdb/fun.py
@@ -6,18 +6,15 @@
 Keeping this code separate from the beginning makes it easier to out-source
 it into c later, if required"""
 
-from gitdb.exc import (
-    BadObjectType
-)
-
 import zlib
 from gitdb.util import byte_ord
 decompressobj = zlib.decompressobj
 
 import mmap
 from itertools import islice
+from functools import reduce
 
-from gitdb.utils.compat import izip
+from gitdb.utils.compat import izip, buffer, xrange
 from gitdb.typ import (
     str_blob_type,
     str_commit_type,
@@ -247,7 +244,6 @@ class DeltaChunkList(list):
         if slen < 2:
             return self
         i = 0
-        slen_orig = slen
 
         first_data_index = None
         while i < slen:
@@ -399,7 +395,6 @@ def loose_object_header_info(m):
         object as well as its uncompressed size in bytes.
     :param m: memory map from which to read the compressed object data"""
     from gitdb.const import NULL_BYTE
-    from gitdb.utils.encoding import force_text
 
     decompress_size = 8192      # is used in cgit as well
     hdr = decompressobj().decompress(m, decompress_size)
@@ -684,7 +679,7 @@ def is_equal_canonical_sha(canonical_length, match, sha1):
 
 
 try:
-    # raise ImportError; # DEBUG
+    # NOQA
     from _perf import connect_deltas
 except ImportError:
     pass
diff --git a/gitdb/pack.py b/gitdb/pack.py
index fbfd18b..87818b6 100644
--- a/gitdb/pack.py
+++ b/gitdb/pack.py
@@ -7,6 +7,7 @@ import zlib
 
 from gitdb.exc import (
     BadObject,
+    AmbiguousObjectName,
     UnsupportedOperation,
     ParseError
 )
@@ -57,11 +58,7 @@ from gitdb.stream import (
     FlexibleSha1Writer
 )
 
-from struct import (
-    pack,
-    unpack,
-)
-
+from struct import pack
 from binascii import crc32
 
 from gitdb.const import NULL_BYTE
diff --git a/gitdb/stream.py b/gitdb/stream.py
index de58848..5daf01c 100644
--- a/gitdb/stream.py
+++ b/gitdb/stream.py
@@ -3,9 +3,8 @@
 # This module is part of GitDB and is released under
 # the New BSD License: http://www.opensource.org/licenses/bsd-license.php
 
-from io import BytesIO, StringIO
+from io import BytesIO
 
-import errno
 import mmap
 import os
 import zlib
@@ -15,7 +14,6 @@ from gitdb.fun import (
     stream_copy,
     apply_delta_data,
     connect_deltas,
-    DeltaChunkList,
     delta_types
 )
 
diff --git a/gitdb/test/db/lib.py b/gitdb/test/db/lib.py
index 8e333dd..67958c3 100644
--- a/gitdb/test/db/lib.py
+++ b/gitdb/test/db/lib.py
@@ -6,12 +6,16 @@
 from gitdb.test.lib import (
     with_rw_directory,
     with_packs_rw,
-    ZippedStoreShaWriter,
     fixture_path,
     TestBase
 )
 
-from gitdb.stream import Sha1Writer
+
+
+from gitdb.stream import (
+    Sha1Writer,
+    ZippedStoreShaWriter
+)
 
 from gitdb.base import (
     IStream,
diff --git a/gitdb/test/db/test_git.py b/gitdb/test/db/test_git.py
index cce2b9c..4bce7da 100644
--- a/gitdb/test/db/test_git.py
+++ b/gitdb/test/db/test_git.py
@@ -2,7 +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 gitdb.test.db.lib import *
+from gitdb.test.db.lib import (
+    TestDBBase, 
+    fixture_path,
+    with_rw_directory
+)
 from gitdb.exc import BadObject
 from gitdb.db import GitDB
 from gitdb.base import OStream, OInfo
diff --git a/gitdb/test/db/test_loose.py b/gitdb/test/db/test_loose.py
index 5e42b63..1299f7b 100644
--- a/gitdb/test/db/test_loose.py
+++ b/gitdb/test/db/test_loose.py
@@ -2,7 +2,10 @@
 #
 # This module is part of GitDB and is released under
 # the New BSD License: http://www.opensource.org/licenses/bsd-license.php
-from gitdb.test.db.lib import *
+from gitdb.test.db.lib import (
+    TestDBBase, 
+    with_rw_directory
+)
 from gitdb.db import LooseObjectDB
 from gitdb.exc import BadObject
 from gitdb.util import bin_to_hex
diff --git a/gitdb/test/db/test_mem.py b/gitdb/test/db/test_mem.py
index 9235b21..97f7217 100644
--- a/gitdb/test/db/test_mem.py
+++ b/gitdb/test/db/test_mem.py
@@ -2,7 +2,10 @@
 #
 # This module is part of GitDB and is released under
 # the New BSD License: http://www.opensource.org/licenses/bsd-license.php
-from gitdb.test.db.lib import *
+from gitdb.test.db.lib import (
+    TestDBBase,
+    with_rw_directory
+)
 from gitdb.db import (
     MemoryDB,
     LooseObjectDB
diff --git a/gitdb/test/db/test_pack.py b/gitdb/test/db/test_pack.py
index f5a4dcb..1177cf9 100644
--- a/gitdb/test/db/test_pack.py
+++ b/gitdb/test/db/test_pack.py
@@ -2,9 +2,12 @@
 #
 # This module is part of GitDB and is released under
 # the New BSD License: http://www.opensource.org/licenses/bsd-license.php
-from gitdb.test.db.lib import *
+from gitdb.test.db.lib import (
+    TestDBBase,
+    with_rw_directory,
+    with_packs_rw
+)
 from gitdb.db import PackedDB
-from gitdb.test.lib import fixture_path
 
 from gitdb.exc import BadObject, AmbiguousObjectName
 
@@ -46,8 +49,8 @@ class TestPackDB(TestDBBase):
         random.shuffle(sha_list)
 
         for sha in sha_list:
-            info = pdb.info(sha)
-            stream = pdb.stream(sha)
+            pdb.info(sha)
+            pdb.stream(sha)
         # END for each sha to query
 
 
diff --git a/gitdb/test/lib.py b/gitdb/test/lib.py
index cb77e69..d88ec8b 100644
--- a/gitdb/test/lib.py
+++ b/gitdb/test/lib.py
@@ -3,14 +3,7 @@
 # This module is part of GitDB and is released under
 # the New BSD License: http://www.opensource.org/licenses/bsd-license.php
 """Utilities used in ODB testing"""
-from gitdb import (
-    OStream,
-    )
-from gitdb.stream import (
-    Sha1Writer,
-    ZippedStoreShaWriter
-)
-
+from gitdb import OStream
 from gitdb.utils.compat import xrange
 
 import sys
diff --git a/gitdb/test/performance/lib.py b/gitdb/test/performance/lib.py
index 3563fcf..5b5c40e 100644
--- a/gitdb/test/performance/lib.py
+++ b/gitdb/test/performance/lib.py
@@ -4,9 +4,7 @@
 # the New BSD License: http://www.opensource.org/licenses/bsd-license.php
 """Contains library functions"""
 import os
-from gitdb.test.lib import *
-import shutil
-import tempfile
+from gitdb.test.lib import TestBase
 
 
 #{ Invvariants
diff --git a/gitdb/test/performance/test_pack.py b/gitdb/test/performance/test_pack.py
index 63856e2..b18e31a 100644
--- a/gitdb/test/performance/test_pack.py
+++ b/gitdb/test/performance/test_pack.py
@@ -9,11 +9,11 @@ from lib import (
 
 from gitdb.exc import UnsupportedOperation
 from gitdb.db.pack import PackedDB
+from gitdb.utils.compat import xrange
 
 import sys
 import os
 from time import time
-import random
 
 from nose import SkipTest
 
diff --git a/gitdb/test/performance/test_pack_streaming.py b/gitdb/test/performance/test_pack_streaming.py
index c66e60c..2974263 100644
--- a/gitdb/test/performance/test_pack_streaming.py
+++ b/gitdb/test/performance/test_pack_streaming.py
@@ -38,7 +38,6 @@ class TestPackStreamingPerformance(TestBigRepoR):
         
         ni = 5000
         count = 0
-        total_size = 0
         st = time()
         for sha in pdb.sha_iter():
             count += 1
diff --git a/gitdb/test/performance/test_stream.py b/gitdb/test/performance/test_stream.py
index 010003d..6c8f715 100644
--- a/gitdb/test/performance/test_stream.py
+++ b/gitdb/test/performance/test_stream.py
@@ -4,13 +4,13 @@
 # the New BSD License: http://www.opensource.org/licenses/bsd-license.php
 """Performance data streaming performance"""
 from lib import TestBigRepoR
-from gitdb.db import *
-from gitdb.base import *
-from gitdb.stream import *
+from gitdb.db import LooseObjectDB
+from gitdb.stream import IStream
+
 from gitdb.util import (
-                            pool,
-                            bin_to_hex
-                        )
+    pool,
+    bin_to_hex
+)
 from gitdb.typ import str_blob_type
 from gitdb.fun import chunk_size
 
@@ -19,19 +19,15 @@ from async import (
     ChannelThreadTask,
     )
 
-from cStringIO import StringIO
 from time import time
 import os
 import sys
-import stat
-import subprocess
 
 
 from lib import (
-    TestBigRepoR,
     make_memory_file,
     with_rw_directory
-    )
+)
 
 
 #{ Utilities
diff --git a/gitdb/test/test_base.py b/gitdb/test/test_base.py
index 4cca7da..578c29f 100644
--- a/gitdb/test/test_base.py
+++ b/gitdb/test/test_base.py
@@ -9,7 +9,15 @@ from gitdb.test.lib import (
         DeriveTest,
     )
 
-from gitdb import *
+from gitdb import (
+    OInfo,
+    OPackInfo,
+    ODeltaPackInfo,
+    OStream,
+    OPackStream,
+    ODeltaPackStream,
+    IStream
+)
 from gitdb.util import (
     NULL_BIN_SHA
     )
diff --git a/gitdb/test/test_example.py b/gitdb/test/test_example.py
index c644b88..433518c 100644
--- a/gitdb/test/test_example.py
+++ b/gitdb/test/test_example.py
@@ -3,7 +3,10 @@
 # This module is part of GitDB and is released under
 # the New BSD License: http://www.opensource.org/licenses/bsd-license.php
 """Module with examples from the tutorial section of the docs"""
-from gitdb.test.lib import *
+from gitdb.test.lib import (
+    TestBase, 
+    fixture_path
+)
 from gitdb import IStream
 from gitdb.db import LooseObjectDB
 from gitdb.util import pool
diff --git a/gitdb/test/test_pack.py b/gitdb/test/test_pack.py
index 6b67ad8..3ab2fec 100644
--- a/gitdb/test/test_pack.py
+++ b/gitdb/test/test_pack.py
@@ -6,7 +6,6 @@
 from gitdb.test.lib import (
     TestBase,
     with_rw_directory,
-    with_packs_rw,
     fixture_path
 )
 
@@ -27,7 +26,6 @@ from gitdb.fun import delta_types
 from gitdb.exc import UnsupportedOperation
 from gitdb.util import to_bin_sha
 from gitdb.utils.compat import xrange
-from itertools import chain
 
 try:
     from itertools import izip
@@ -37,7 +35,6 @@ except ImportError:
 from nose import SkipTest
 
 import os
-import sys
 import tempfile
 
 
diff --git a/gitdb/test/test_stream.py b/gitdb/test/test_stream.py
index 984d6e1..671a146 100644
--- a/gitdb/test/test_stream.py
+++ b/gitdb/test/test_stream.py
@@ -7,17 +7,18 @@
 from gitdb.test.lib import (
     TestBase,
     DummyStream,
-    Sha1Writer,
     make_bytes,
     make_object,
     fixture_path
 )
 
-from gitdb import *
-from gitdb.util import (
-    NULL_HEX_SHA,
-    hex_to_bin
+from gitdb import (
+    DecompressMemMapReader,
+    FDCompressedSha1Writer,
+    LooseObjectDB,
+    Sha1Writer
 )
+from gitdb.util import hex_to_bin
 
 import zlib
 from gitdb.typ import (
diff --git a/gitdb/test/test_util.py b/gitdb/test/test_util.py
index ec9a86c..e79355a 100644
--- a/gitdb/test/test_util.py
+++ b/gitdb/test/test_util.py
@@ -5,7 +5,6 @@
 """Test for object db"""
 import tempfile
 import os
-import sys
 
 from gitdb.test.lib import TestBase
 from gitdb.util import (
diff --git a/gitdb/util.py b/gitdb/util.py
index 77a0023..8843e8c 100644
--- a/gitdb/util.py
+++ b/gitdb/util.py
@@ -77,7 +77,10 @@ close = os.close
 fsync = os.fsync
 
 # Backwards compatibility imports
-from gitdb.const import NULL_BIN_SHA, NULL_HEX_SHA
+from gitdb.const import ( 
+    NULL_BIN_SHA, 
+    NULL_HEX_SHA
+)
 
 #} END Aliases
 
@@ -124,6 +127,7 @@ def make_sha(source=''.encode("ascii")):
     try:
         return hashlib.sha1(source)
     except NameError:
+        import sha
         sha1 = sha.sha(source)
         return sha1
 
diff --git a/gitdb/utils/compat.py b/gitdb/utils/compat.py
index eec319f..a2640fd 100644
--- a/gitdb/utils/compat.py
+++ b/gitdb/utils/compat.py
@@ -6,8 +6,10 @@ try:
     from itertools import izip
     xrange = xrange
 except ImportError:
+    # py3
     izip = zip
     xrange = range
+# end handle python version
 
 try:
     # Python 2
@@ -15,11 +17,15 @@ try:
     memoryview = buffer
 except NameError:
     # Python 3 has no `buffer`; only `memoryview`
+    # However, it's faster to just slice the object directly, maybe it keeps a view internally
     def buffer(obj, offset, size=None):
         if size is None:
-            return memoryview(obj)[offset:]
+            # return memoryview(obj)[offset:]
+            return obj[offset:]
         else:
-            return memoryview(obj[offset:offset+size])
+            # return memoryview(obj)[offset:offset+size]
+            return obj[offset:offset+size]
+    # end buffer reimplementation
 
     memoryview = memoryview