Merge pull request #56 from dougalsutherland/py3-fixes

fix imports for python 3

Author: martindurant

.gitignore

@@ -3,4 +3,5 @@ build
 dist
 MANIFEST
 __pycache__
-
+*.so
+*.egg-info

setup.py

@@ -24,7 +24,10 @@
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 import sys
-from distutils.core import setup, Extension
+try:
+    from setuptools import setup, Extension
+except ImportError:
+    from distutils.core import setup, Extension
 
 version = '0.5.2'
 long_description = """
@@ -73,7 +76,7 @@
                  'Programming Language :: Python :: 3.5',
                  'Programming Language :: Python :: 3.6',
                  ],
-    ext_modules = ext_modules,
-    packages = packages,
-    install_requires = install_requires
+    ext_modules=ext_modules,
+    packages=packages,
+    install_requires=install_requires
 )

snappy/__init__.py

@@ -1,4 +1,4 @@
-from snappy import (
+from .snappy import (
 	compress,
 	decompress,
 	uncompress,
@@ -8,4 +8,4 @@
 	StreamDecompressor,
 	UncompressError,
 	isValidCompressed,
-)
+)

snappy/__main__.py

@@ -1,4 +1,4 @@
-from snappy import stream_compress, stream_decompress
+from .snappy import stream_compress, stream_decompress
 
 def cmdline_main():
     """This method is what is run when invoking snappy via the commandline.
@@ -37,4 +37,4 @@ def cmdline_main():
 
 
 if __name__ == "__main__":
-    cmdline_main()
+    cmdline_main()

snappy/snappy.py

@@ -44,11 +44,11 @@
 import struct
 
 try:
-    from _snappy import UncompressError, compress, decompress, \
-                        isValidCompressed, uncompress, _crc32c
+    from ._snappy import UncompressError, compress, decompress, \
+                         isValidCompressed, uncompress, _crc32c
 except ImportError:
-    from snappy_cffi import UncompressError, compress, decompress, \
-                            isValidCompressed, uncompress, _crc32c
+    from .snappy_cffi import UncompressError, compress, decompress, \
+                             isValidCompressed, uncompress, _crc32c
 
 _CHUNK_MAX = 65536
 _STREAM_TO_STREAM_BLOCK_SIZE = _CHUNK_MAX