zstd: Remove _ZSTD_CStreamSizes, replace _ZSTD_DStreamSizes with ZSTD_DStreamOutSize

Author: AA-Turner

Lib/compression/zstd/_zstdfile.py

@@ -1,13 +1,11 @@
 import io
 from os import PathLike
-from _zstd import (ZstdCompressor, ZstdDecompressor, _ZSTD_DStreamSizes,
-                   ZstdError)
+from _zstd import (ZstdCompressor, ZstdDecompressor, ZstdError,
+                   ZSTD_DStreamOutSize)
 from compression._common import _streams
 
 __all__ = ("ZstdFile", "open")
 
-_ZSTD_DStreamOutSize = _ZSTD_DStreamSizes[1]
-
 _MODE_CLOSED = 0
 _MODE_READ = 1
 _MODE_WRITE = 2
@@ -188,7 +186,7 @@ def read1(self, size=-1):
             # Note this should *not* be io.DEFAULT_BUFFER_SIZE.
             # ZSTD_DStreamOutSize is the minimum amount to read guaranteeing
             # a full block is read.
-            size = _ZSTD_DStreamOutSize
+            size = ZSTD_DStreamOutSize
         return self._buffer.read1(size)
 
     def readinto(self, b):

Modules/_zstd/_zstdmodule.c

@@ -644,30 +644,16 @@ add_vars_to_module(PyObject *module)
     }
 #endif
 
-    /* Add zstd parameters */
-    if (add_parameters(module) < 0) {
+    /* ZSTD_DStreamOutSize, int */
+    if (PyModule_AddIntConstant(module, "ZSTD_DStreamOutSize",
+                                (uint32_t)ZSTD_DStreamOutSize()) < 0) {
         return -1;
     }
 
-    /* _ZSTD_CStreamSizes */
-    obj = Py_BuildValue("II",
-                        (uint32_t)ZSTD_CStreamInSize(),
-                        (uint32_t)ZSTD_CStreamOutSize());
-    if (PyModule_AddObjectRef(module, "_ZSTD_CStreamSizes", obj) < 0) {
-        Py_XDECREF(obj);
-        return -1;
-    }
-    Py_DECREF(obj);
-
-    /* _ZSTD_DStreamSizes */
-    obj = Py_BuildValue("II",
-                        (uint32_t)ZSTD_DStreamInSize(),
-                        (uint32_t)ZSTD_DStreamOutSize());
-    if (PyModule_AddObjectRef(module, "_ZSTD_DStreamSizes", obj) < 0) {
-        Py_XDECREF(obj);
+    /* Add zstd parameters */
+    if (add_parameters(module) < 0) {
         return -1;
     }
-    Py_DECREF(obj);
 
     /* _ZSTD_CONFIG */
     obj = Py_BuildValue("isOOO", 8*(int)sizeof(Py_ssize_t), "c",