New version 1.4.9.1

- fix python3.8+ warnings - use py_ssize_t type
- update unittests - use os.environ everywhere

Author: Sergey Dryabzhinsky

PKG-INFO

@@ -1,12 +1,12 @@
 Metadata-Version: 1.1
 Name: zstd
-Version: 1.4.9.0
+Version: 1.4.9.1
 Summary: Simple python bindings to Yann Collet ZSTD compression library
 Home-page: https://github.com/sergey-dryabzhinsky/python-zstd
 Author: Sergey Dryabzhinsky
 Author-email: [email protected]
 License: BSD
-Download-URL: https://github.com/sergey-dryabzhinsky/python-zstd/archive/v1.4.9.0.tar.gz
+Download-URL: https://github.com/sergey-dryabzhinsky/python-zstd/archive/v1.4.9.1.tar.gz
 Description: Simple ZSTandarD bindings for Python
 Keywords: zstd,zstandard,compression
 Platform: POSIX

setup.py

@@ -14,7 +14,7 @@
 # Package version
 PKG_VERSION = VERSION
 # Minor versions
-PKG_VERSION += ("0",)
+PKG_VERSION += ("1",)
 PKG_VERSION_STR = ".".join([str(x) for x in PKG_VERSION])
 
 ###
@@ -161,20 +161,26 @@ def build_extensions(self):
 zstdFiles.append('src/util.c')
 zstdFiles.append('src/python-zstd.c')
 
-# Python 2.6 compat
-os.environ["VERSION"] = VERSION_STR
-os.environ["PKG_VERSION"] = PKG_VERSION_STR
-if SUP_LEGACY:
-    os.environ["LEGACY"] = "1"
-if SUP_EXTERNAL:
-    os.environ["ZSTD_EXTERNAL"] = "1"
-if SUP_PYZSTD_LEGACY:
-    os.environ["PYZSTD_LEGACY"] = "1"
+
+def setup_env():
+    # Python 2.6 compat
+    os.environ["VERSION"] = VERSION_STR
+    os.environ["PKG_VERSION"] = PKG_VERSION_STR
+    os.environ["LEGACY"] = "0"
+    os.environ["ZSTD_EXTERNAL"] = "0"
+    os.environ["PYZSTD_LEGACY"] = "0"
+    if SUP_LEGACY:
+        os.environ["LEGACY"] = "1"
+    if SUP_EXTERNAL:
+        os.environ["ZSTD_EXTERNAL"] = "1"
+    if SUP_PYZSTD_LEGACY:
+        os.environ["PYZSTD_LEGACY"] = "1"
 
 # Another dirty hack
 def my_test_suite():
     import unittest
 
+    setup_env()
     test_suite = unittest.TestSuite()
     for test in os.listdir('tests'):
         if test.startswith("test_") and test.endswith(".py"):

src/python-zstd.c

@@ -29,13 +29,16 @@
 
 #include <stdlib.h>
 #include <stddef.h>
+
+/* Since 3.8 it is mandatory to use proper type for # formats */
+#define PY_SSIZE_T_CLEAN
 #include <Python.h>
+
 #include "bytesobject.h"
 #include "zstd.h"
 #include "util.h"
 #include "python-zstd.h"
 
-
 /**
  * New function for multi-threaded compression.
  * Uses origin zstd header, nothing more.
@@ -47,12 +50,13 @@ static PyObject *py_zstd_compress_mt(PyObject* self, PyObject *args)
 
     PyObject *result;
     const char *source;
-    uint32_t source_size;
+    Py_ssize_t source_size;
     char *dest;
-    uint32_t dest_size;
+    Py_ssize_t dest_size;
     size_t cSize;
     int32_t level = ZSTD_CLEVEL_DEFAULT;
     int32_t threads = 0;
+    ZSTD_CCtx* cctx = 0;
 
 #if PY_MAJOR_VERSION >= 3
     if (!PyArg_ParseTuple(args, "y#|ii", &source, &source_size, &level, &threads))
@@ -87,7 +91,7 @@ static PyObject *py_zstd_compress_mt(PyObject* self, PyObject *args)
         return NULL;
     }
 
-    dest_size = ZSTD_compressBound(source_size);
+    dest_size = (Py_ssize_t)ZSTD_compressBound(source_size);
     result = PyBytes_FromStringAndSize(NULL, dest_size);
     if (result == NULL) {
         return NULL;
@@ -96,12 +100,13 @@ static PyObject *py_zstd_compress_mt(PyObject* self, PyObject *args)
     if (source_size > 0) {
         dest = PyBytes_AS_STRING(result);
 
-        ZSTD_CCtx* cctx = ZSTD_createCCtx();
+        cctx = ZSTD_createCCtx();
+
         ZSTD_CCtx_setParameter(cctx, ZSTD_c_compressionLevel, level);
         ZSTD_CCtx_setParameter(cctx, ZSTD_c_nbWorkers, threads);
 
         Py_BEGIN_ALLOW_THREADS
-        cSize = ZSTD_compress2(cctx, dest, dest_size, source, source_size);
+        cSize = ZSTD_compress2(cctx, dest, (size_t)dest_size, source, (size_t)source_size);
         Py_END_ALLOW_THREADS
 
         ZSTD_freeCCtx(cctx);
@@ -126,7 +131,7 @@ static PyObject *py_zstd_uncompress(PyObject* self, PyObject *args)
 
     PyObject    *result;
     const char  *source;
-    uint32_t    source_size;
+    Py_ssize_t  source_size;
     uint64_t    dest_size;
     char        error = 0;
     size_t      cSize;
@@ -233,7 +238,7 @@ static PyObject *py_zstd_compress_old(PyObject* self, PyObject *args) {
 
     PyObject *result;
     const char *source;
-    uint32_t source_size;
+    Py_ssize_t source_size;
     char *dest;
     uint32_t dest_size;
     size_t cSize;
@@ -289,7 +294,7 @@ static PyObject *py_zstd_uncompress_old(PyObject* self, PyObject *args) {
 
     PyObject *result;
     const char *source;
-    uint32_t source_size;
+    Py_ssize_t source_size;
     uint32_t dest_size;
     size_t cSize;
 

tests/test_compress.py

@@ -7,10 +7,8 @@
 class TestZSTD(BaseTestZSTD):
 
     def setUp(self):
-        if os.getenv("LEGACY"):
-            self.LEGACY = True
-        if os.getenv("PYZSTD_LEGACY"):
-            self.PYZSTD_LEGACY = True
+        self.LEGACY = os.environ["LEGACY"] == "1"
+        self.PYZSTD_LEGACY = os.environ["PYZSTD_LEGACY"] == "1"
 
     def test_compression_random(self):
         BaseTestZSTD.helper_compression_random(self)

tests/test_version.py

@@ -7,10 +7,9 @@
 class TestZSTD(BaseTestZSTD):
 
     def setUp(self):
-        if os.getenv("ZSTD_EXTERNAL"):
-            self.ZSTD_EXTERNAL = True
-        self.VERSION = os.getenv("VERSION")
-        self.PKG_VERSION = os.getenv("PKG_VERSION")
+        self.ZSTD_EXTERNAL = os.environ["ZSTD_EXTERNAL"] == "1"
+        self.VERSION = os.environ["VERSION"]
+        self.PKG_VERSION = os.environ["PKG_VERSION"]
         v = [int(n) for n in reversed(self.VERSION.split("."))]
         self.VERSION_INT = 0
         i = 0