Modified to build snappy inline so we do not need to link against lib…

…snappy.

.gitignore

@@ -2,4 +2,4 @@
 build
 dist
 MANIFEST
-
+__pycache__

crc32c.c

@@ -15,7 +15,11 @@
  *****************************************************************************/
 #include "crc32c.h"     /* include the header file generated with pycrc */
 #include <stdlib.h>
+#if defined(_MSC_VER)
+#include "stdint.h"
+#else
 #include <stdint.h>
+#endif
 
 /**
  * Static table used for the table_driven implementation.

crc32c.h

@@ -17,7 +17,11 @@
 #define __CRC32C_H__
 
 #include <stdlib.h>
+#if defined(_MSC_VER)
+#include "stdint.h"
+#else
 #include <stdint.h>
+#endif
 
 #ifdef __cplusplus
 extern "C" {
@@ -53,7 +57,7 @@ crc_t crc_reflect(crc_t data, size_t data_len);
  *
  * \return     The initial crc value.
  *****************************************************************************/
-static inline crc_t crc_init(void)
+static  crc_t crc_init(void)
 {
     return 0xffffffff;
 }
@@ -76,7 +80,7 @@ crc_t crc_update(crc_t crc, const unsigned char *data, size_t data_len);
  * \param crc  The current crc value.
  * \return     The final crc value.
  *****************************************************************************/
-static inline crc_t crc_finalize(crc_t crc)
+static  crc_t crc_finalize(crc_t crc)
 {
     return crc ^ 0xffffffff;
 }

setup.py

@@ -12,31 +12,37 @@
 #       names of its contributors may be used to endorse or promote products
 #       derived from this software without specific prior written permission.
 #
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL ANDRES MOREIRA BE LIABLE FOR ANY
-# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL ANDRES MOREIRA BE LIABLE FOR ANY DIRECT,
+# INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+# OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+# EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 import sys
-from distutils.core import setup, Extension
+from setuptools import setup, Extension
 
 version = '0.5'
 long_description = """
 Python bindings for the snappy compression library from Google.
 
 More details about Snappy library: http://code.google.com/p/snappy
-"""
 
+This package is statically built against the snappy codebase so that we do not
+need to ship libsnappy.so together with the python module. This makes it easier
+to host on PyPi.
+"""
 
 snappymodule = Extension('_snappy',
-                         libraries=['snappy'],
-                         sources=['snappymodule.cc', 'crc32c.c'])
+                         sources=[
+                             'snappymodule.cc', 'crc32c.c',
+                             'snappy-c.cc', 'snappy-sinksource.cc',
+                             'snappy-stubs-internal.cc', 'snappy.cc',
+                         ])
 
 ext_modules = [snappymodule]
 packages = ['.']
@@ -47,36 +53,45 @@
     ext_modules = []
     install_requires = ['cffi']
 
-setup(
-    name='python-snappy',
-    version=version,
-    author='Andres Moreira',
-    author_email='[email protected]',
-    url='https://github.com/andrix/python-snappy',
-    description='Python library for the snappy compression library from Google',
-    long_description=long_description,
-    keywords='snappy, compression, google',
-    license='BSD',
-    classifiers=['Development Status :: 4 - Beta',
-                 'Topic :: Internet',
-                 'Topic :: Software Development',
-                 'Topic :: Software Development :: Libraries',
-                 'Topic :: System :: Archiving :: Compression',
-                 'License :: OSI Approved :: BSD License',
-                 'Intended Audience :: Developers',
-                 'Intended Audience :: System Administrators',
-                 'Operating System :: MacOS :: MacOS X',
-                 # 'Operating System :: Microsoft :: Windows', -- Not tested yet
-                 'Operating System :: POSIX',
-                 'Programming Language :: Python :: 2.5',
-                 'Programming Language :: Python :: 2.6',
-                 'Programming Language :: Python :: 2.7',
-                 'Programming Language :: Python :: 3',
-                 'Programming Language :: Python :: 3.0',
-                 'Programming Language :: Python :: 3.1',
-                 'Programming Language :: Python :: 3.2',
-                 ],
-    ext_modules = ext_modules,
-    packages = packages,
-    install_requires = install_requires
-)
+
+def main():
+    setup(
+        # This particular distribution is used as a dependency for the PyAFF4
+        # library for easy deployment.
+        name='aff4-snappy',
+        version=version,
+        author='Andres Moreira',
+        author_email='[email protected]',
+        url='https://github.com/andrix/python-snappy',
+        description=(
+            'Python library for the snappy compression library from Google'),
+        long_description=long_description,
+        keywords='snappy, compression, google',
+        license='BSD',
+        classifiers=['Development Status :: 4 - Beta',
+                     'Topic :: Internet',
+                     'Topic :: Software Development',
+                     'Topic :: Software Development :: Libraries',
+                     'Topic :: System :: Archiving :: Compression',
+                     'License :: OSI Approved :: BSD License',
+                     'Intended Audience :: Developers',
+                     'Intended Audience :: System Administrators',
+                     'Operating System :: MacOS :: MacOS X',
+                     'Operating System :: Microsoft :: Windows',
+                     'Operating System :: POSIX',
+                     'Programming Language :: Python :: 2.5',
+                     'Programming Language :: Python :: 2.6',
+                     'Programming Language :: Python :: 2.7',
+                     'Programming Language :: Python :: 3',
+                     'Programming Language :: Python :: 3.0',
+                     'Programming Language :: Python :: 3.1',
+                     'Programming Language :: Python :: 3.2',
+                    ],
+        ext_modules=ext_modules,
+        packages=packages,
+        install_requires=install_requires
+    )
+
+
+if __name__ == "__main__":
+    main()

snappy-c.cc

@@ -0,0 +1,90 @@
+// Copyright 2011 Martin Gieseking <[email protected]>.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#include "snappy.h"
+#include "snappy-c.h"
+
+extern "C" {
+
+snappy_status snappy_compress(const char* input,
+                              size_t input_length,
+                              char* compressed,
+                              size_t *compressed_length) {
+  if (*compressed_length < snappy_max_compressed_length(input_length)) {
+    return SNAPPY_BUFFER_TOO_SMALL;
+  }
+  snappy::RawCompress(input, input_length, compressed, compressed_length);
+  return SNAPPY_OK;
+}
+
+snappy_status snappy_uncompress(const char* compressed,
+                                size_t compressed_length,
+                                char* uncompressed,
+                                size_t* uncompressed_length) {
+  size_t real_uncompressed_length;
+  if (!snappy::GetUncompressedLength(compressed,
+                                     compressed_length,
+                                     &real_uncompressed_length)) {
+    return SNAPPY_INVALID_INPUT;
+  }
+  if (*uncompressed_length < real_uncompressed_length) {
+    return SNAPPY_BUFFER_TOO_SMALL;
+  }
+  if (!snappy::RawUncompress(compressed, compressed_length, uncompressed)) {
+    return SNAPPY_INVALID_INPUT;
+  }
+  *uncompressed_length = real_uncompressed_length;
+  return SNAPPY_OK;
+}
+
+size_t snappy_max_compressed_length(size_t source_length) {
+  return snappy::MaxCompressedLength(source_length);
+}
+
+snappy_status snappy_uncompressed_length(const char *compressed,
+                                         size_t compressed_length,
+                                         size_t *result) {
+  if (snappy::GetUncompressedLength(compressed,
+                                    compressed_length,
+                                    result)) {
+    return SNAPPY_OK;
+  } else {
+    return SNAPPY_INVALID_INPUT;
+  }
+}
+
+snappy_status snappy_validate_compressed_buffer(const char *compressed,
+                                                size_t compressed_length) {
+  if (snappy::IsValidCompressedBuffer(compressed, compressed_length)) {
+    return SNAPPY_OK;
+  } else {
+    return SNAPPY_INVALID_INPUT;
+  }
+}
+
+}  // extern "C"