Minor adjustments to adapt to changes in async (due to be removed anyway)

Author: Byron

gitdb/__init__.py

@@ -27,7 +27,7 @@ def _init_externals():
 __author__ = "Sebastian Thiel"
 __contact__ = "[email protected]"
 __homepage__ = "https://github.com/gitpython-developers/gitdb"
-version_info = (0, 5, 4)
+version_info = (0, 5, 5)
 __version__ = '.'.join(str(i) for i in version_info)
 
 

gitdb/base.py

@@ -3,11 +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 basic data structures - they are designed to be lightweight and fast"""
-from util import (
-        bin_to_hex,
-        zlib
-    )
-
+from util import bin_to_hex
 from fun import (
                     type_id_to_type_map,
                     type_to_type_id_map

gitdb/ext/async

@@ -10,7 +10,7 @@
     BadObjectType
     )
 
-from util import zlib
+import zlib
 decompressobj = zlib.decompressobj
 
 import mmap

gitdb/ext/smmap

@@ -3,13 +3,14 @@
 # This module is part of GitDB and is released under
 # the New BSD License: http://www.opensource.org/licenses/bsd-license.php
 """Contains PackIndexFile and PackFile implementations"""
+import zlib
+
 from gitdb.exc import (
                         BadObject,
                         UnsupportedOperation,
                         ParseError
                         )
 from util import (
-                    zlib,
                     mman,
                     LazyMixin,
                     unpack_from,

gitdb/fun.py

@@ -4,7 +4,7 @@
 # the New BSD License: http://www.opensource.org/licenses/bsd-license.php
 
 from cStringIO import StringIO
-import errno
+import zlib
 import mmap
 import os
 
@@ -23,7 +23,6 @@
         make_sha,
         write, 
         close,
-        zlib
     )
 
 has_perf_mod = False

gitdb/pack.py

@@ -11,8 +11,6 @@
                             ZippedStoreShaWriter
                         )
 
-from gitdb.util import zlib
-
 import sys
 import random
 from array import array

gitdb/stream.py

@@ -18,12 +18,11 @@
     hex_to_bin
     )
 
-from gitdb.util import zlib
+import zlib
 from gitdb.typ import (
     str_blob_type
     )
 
-import time
 import tempfile
 import os
 

gitdb/test/lib.py

@@ -7,27 +7,22 @@
 import mmap
 import sys
 import errno
-
-from cStringIO import StringIO
+import stat
 
 # in py 2.4, StringIO is only StringI, without write support.
 # Hence we must use the python implementation for this
 if sys.version_info[1] < 5:
     from StringIO import StringIO
+else:
+    from cStringIO import StringIO
 # END handle python 2.4
 
-try:
-    import async.mod.zlib as zlib
-except ImportError:
-    import zlib
-# END try async zlib
-
 from async import ThreadPool
 from smmap import (
-                    StaticWindowMapManager,
-                    SlidingWindowMapManager,
-                    SlidingWindowMapBuffer
-                )
+        StaticWindowMapManager,
+        SlidingWindowMapManager,
+        SlidingWindowMapBuffer
+    )
 
 # initialize our global memory manager instance
 # Use it to free cached (and unused) resources.
@@ -304,7 +299,7 @@ def open(self, write=False, stream=False):
         binary = getattr(os, 'O_BINARY', 0)
         lockmode =  os.O_WRONLY | os.O_CREAT | os.O_EXCL | binary
         try:
-            fd = os.open(self._lockfilepath(), lockmode, 0600)
+            fd = os.open(self._lockfilepath(), lockmode, stat.S_IREAD|stat.S_IWRITE)
             if not write:
                 os.close(fd)
             else:
@@ -373,7 +368,7 @@ def _end_writing(self, successful=True):
             # assure others can at least read the file - the tmpfile left it at rw--
             # We may also write that file, on windows that boils down to a remove-
             # protection as well
-            chmod(self._filepath, 0644)
+            chmod(self._filepath, stat.S_IREAD|stat.S_IWRITE|stat.S_IRGRP|stat.S_IROTH)
         else:
             # just delete the file so far, we failed
             os.remove(lockfile)

gitdb/test/test_stream.py

@@ -73,7 +73,7 @@ def get_data_files(self):
 __author__ = "Sebastian Thiel"
 __contact__ = "[email protected]"
 __homepage__ = "https://github.com/gitpython-developers/gitdb"
-version_info = (0, 5, 4)
+version_info = (0, 5, 5)
 __version__ = '.'.join(str(i) for i in version_info)
 
 setup(cmdclass={'build_ext':build_ext_nofail},
@@ -88,15 +88,32 @@ def get_data_files(self):
       ext_modules=[Extension('gitdb._perf', ['gitdb/_fun.c', 'gitdb/_delta_apply.c'], include_dirs=['gitdb'])],
       license = "BSD License",
       zip_safe=False,
-      requires=('async (>=0.6.1)', 'smmap (>=0.8.0)'),
+      requires=('async (>=0.6.2)', 'smmap (>=0.8.3)'),
       install_requires=('async >= 0.6.1', 'smmap >= 0.8.0'),
       long_description = """GitDB is a pure-Python git object database""",
       # See https://pypi.python.org/pypi?%3Aaction=list_classifiers
       classifiers=[
-          # Specify the Python versions you support here. In particular, ensure
-          # that you indicate whether you support Python 2, Python 3 or both.
-          'Programming Language :: Python :: 2',
-          'Programming Language :: Python :: 2.6',
-          'Programming Language :: Python :: 2.7',
-      ],
-      )
+          # Picked from
+        #    http://pypi.python.org/pypi?:action=list_classifiers
+        #"Development Status :: 1 - Planning",
+        #"Development Status :: 2 - Pre-Alpha",
+        #"Development Status :: 3 - Alpha",
+        # "Development Status :: 4 - Beta",
+        "Development Status :: 5 - Production/Stable",
+        #"Development Status :: 6 - Mature",
+        #"Development Status :: 7 - Inactive",
+        "Environment :: Console",
+        "Intended Audience :: Developers",
+        "License :: OSI Approved :: BSD License",
+        "Operating System :: OS Independent",
+        "Operating System :: POSIX",
+        "Operating System :: Microsoft :: Windows",
+        "Operating System :: MacOS :: MacOS X",
+        "Programming Language :: Python",
+        "Programming Language :: Python :: 2",
+        "Programming Language :: Python :: 2.6",
+        "Programming Language :: Python :: 2.7",
+        "Programming Language :: Python :: 3",
+        "Programming Language :: Python :: 3.3",
+        "Programming Language :: Python :: 3.4",
+      ],)