blob: fd6c0b790c92995b9bbaaebef6f29ac69d0aae6b [file] [log] [blame]
Guido van Rossumfb221561997-04-29 15:38:09 +00001/* zlibmodule.c -- gzip-compatible data compression */
Martin v. Löwis1dbce442001-10-09 10:54:31 +00002/* See http://www.gzip.org/zlib/ */
Mark Hammondae8c2682001-01-31 10:28:03 +00003
Tim Petersee826f82001-01-31 19:39:44 +00004/* Windows users: read Python's PCbuild\readme.txt */
Mark Hammondae8c2682001-01-31 10:28:03 +00005
Guido van Rossumfb221561997-04-29 15:38:09 +00006
Guido van Rossum97b54571997-06-03 22:21:47 +00007#include "Python.h"
8#include "zlib.h"
Guido van Rossumfb221561997-04-29 15:38:09 +00009
Martin v. Löwis3bd8c1e2001-09-07 16:27:31 +000010#ifdef WITH_THREAD
11#include "pythread.h"
12
13/* #defs ripped off from _tkinter.c, even though the situation here is much
14 simpler, because we don't have to worry about waiting for Tcl
15 events! And, since zlib itself is threadsafe, we don't need to worry
16 about re-entering zlib functions.
17
Martin v. Löwis3bd8c1e2001-09-07 16:27:31 +000018 N.B.
19
20 Since ENTER_ZLIB and LEAVE_ZLIB only need to be called on functions
21 that modify the components of preexisting de/compress objects, it
22 could prove to be a performance gain on multiprocessor machines if
23 there was an de/compress object-specific lock. However, for the
24 moment the ENTER_ZLIB and LEAVE_ZLIB calls are global for ALL
25 de/compress objects.
Martin v. Löwis3bd8c1e2001-09-07 16:27:31 +000026 */
27
28static PyThread_type_lock zlib_lock = NULL; /* initialized on module load */
29
30#define ENTER_ZLIB \
Tim Peters6605c642001-10-17 03:43:54 +000031 Py_BEGIN_ALLOW_THREADS \
32 PyThread_acquire_lock(zlib_lock, 1); \
33 Py_END_ALLOW_THREADS
Martin v. Löwis3bd8c1e2001-09-07 16:27:31 +000034
35#define LEAVE_ZLIB \
Tim Peters6605c642001-10-17 03:43:54 +000036 PyThread_release_lock(zlib_lock);
Martin v. Löwis3bd8c1e2001-09-07 16:27:31 +000037
38#else
39
40#define ENTER_ZLIB
41#define LEAVE_ZLIB
42
43#endif
44
Guido van Rossumfb221561997-04-29 15:38:09 +000045/* The following parameters are copied from zutil.h, version 0.95 */
46#define DEFLATED 8
47#if MAX_MEM_LEVEL >= 8
48# define DEF_MEM_LEVEL 8
49#else
50# define DEF_MEM_LEVEL MAX_MEM_LEVEL
51#endif
52#define DEF_WBITS MAX_WBITS
53
Guido van Rossumb729a1d1999-04-07 20:23:17 +000054/* The output buffer will be increased in chunks of DEFAULTALLOC bytes. */
55#define DEFAULTALLOC (16*1024)
Guido van Rossumfb221561997-04-29 15:38:09 +000056#define PyInit_zlib initzlib
57
Jeremy Hylton938ace62002-07-17 16:30:39 +000058static PyTypeObject Comptype;
59static PyTypeObject Decomptype;
Guido van Rossumfb221561997-04-29 15:38:09 +000060
61static PyObject *ZlibError;
62
Tim Peters977e5402001-10-17 03:57:20 +000063typedef struct
Guido van Rossumfb221561997-04-29 15:38:09 +000064{
Jeremy Hylton9714f992001-10-16 21:19:45 +000065 PyObject_HEAD
66 z_stream zst;
67 PyObject *unused_data;
68 PyObject *unconsumed_tail;
69 int is_initialised;
Guido van Rossumfb221561997-04-29 15:38:09 +000070} compobject;
71
Jeremy Hylton0965e082001-10-16 21:56:09 +000072static void
73zlib_error(z_stream zst, int err, char *msg)
74{
75 if (zst.msg == Z_NULL)
76 PyErr_Format(ZlibError, "Error %d %s", err, msg);
77 else
78 PyErr_Format(ZlibError, "Error %d %s: %.200s", err, msg, zst.msg);
79}
80
Martin v. Löwis14f8b4c2002-06-13 20:33:02 +000081PyDoc_STRVAR(compressobj__doc__,
Tim Petersadbd35b2001-10-17 04:16:15 +000082"compressobj([level]) -- Return a compressor object.\n"
83"\n"
Martin v. Löwis14f8b4c2002-06-13 20:33:02 +000084"Optional arg level is the compression level, in 1-9.");
Guido van Rossum3c540301997-06-03 22:21:03 +000085
Martin v. Löwis14f8b4c2002-06-13 20:33:02 +000086PyDoc_STRVAR(decompressobj__doc__,
Tim Petersadbd35b2001-10-17 04:16:15 +000087"decompressobj([wbits]) -- Return a decompressor object.\n"
88"\n"
Martin v. Löwis14f8b4c2002-06-13 20:33:02 +000089"Optional arg wbits is the window buffer size.");
Guido van Rossum3c540301997-06-03 22:21:03 +000090
Guido van Rossumfb221561997-04-29 15:38:09 +000091static compobject *
Peter Schneider-Kampa788a7f2000-07-10 09:57:19 +000092newcompobject(PyTypeObject *type)
Guido van Rossumfb221561997-04-29 15:38:09 +000093{
Tim Peters977e5402001-10-17 03:57:20 +000094 compobject *self;
Jeremy Hylton9714f992001-10-16 21:19:45 +000095 self = PyObject_New(compobject, type);
96 if (self == NULL)
97 return NULL;
98 self->is_initialised = 0;
Guido van Rossum776152b2007-05-22 22:44:07 +000099 self->unused_data = PyBytes_FromStringAndSize("", 0);
Jeremy Hylton9714f992001-10-16 21:19:45 +0000100 if (self->unused_data == NULL) {
101 Py_DECREF(self);
102 return NULL;
103 }
Guido van Rossum776152b2007-05-22 22:44:07 +0000104 self->unconsumed_tail = PyBytes_FromStringAndSize("", 0);
Jeremy Hylton9714f992001-10-16 21:19:45 +0000105 if (self->unconsumed_tail == NULL) {
106 Py_DECREF(self);
107 return NULL;
108 }
109 return self;
Guido van Rossumfb221561997-04-29 15:38:09 +0000110}
111
Martin v. Löwis14f8b4c2002-06-13 20:33:02 +0000112PyDoc_STRVAR(compress__doc__,
Tim Petersadbd35b2001-10-17 04:16:15 +0000113"compress(string[, level]) -- Returned compressed string.\n"
114"\n"
Martin v. Löwis14f8b4c2002-06-13 20:33:02 +0000115"Optional arg level is the compression level, in 1-9.");
Guido van Rossum3c540301997-06-03 22:21:03 +0000116
Guido van Rossumfb221561997-04-29 15:38:09 +0000117static PyObject *
Peter Schneider-Kampa788a7f2000-07-10 09:57:19 +0000118PyZlib_compress(PyObject *self, PyObject *args)
Guido van Rossumfb221561997-04-29 15:38:09 +0000119{
Jeremy Hylton9714f992001-10-16 21:19:45 +0000120 PyObject *ReturnVal = NULL;
121 Byte *input, *output;
122 int length, level=Z_DEFAULT_COMPRESSION, err;
123 z_stream zst;
Tim Peters977e5402001-10-17 03:57:20 +0000124
Jeremy Hylton9714f992001-10-16 21:19:45 +0000125 /* require Python string object, optional 'level' arg */
Jeremy Hyltonba3dd992001-10-16 23:26:08 +0000126 if (!PyArg_ParseTuple(args, "s#|i:compress", &input, &length, &level))
Jeremy Hylton9714f992001-10-16 21:19:45 +0000127 return NULL;
Martin v. Löwis3bd8c1e2001-09-07 16:27:31 +0000128
Jeremy Hylton9714f992001-10-16 21:19:45 +0000129 zst.avail_out = length + length/1000 + 12 + 1;
Martin v. Löwis3bd8c1e2001-09-07 16:27:31 +0000130
Jeremy Hylton9d620d02001-10-16 23:02:32 +0000131 output = (Byte*)malloc(zst.avail_out);
132 if (output == NULL) {
Jeremy Hylton9714f992001-10-16 21:19:45 +0000133 PyErr_SetString(PyExc_MemoryError,
134 "Can't allocate memory to compress data");
Jeremy Hylton9714f992001-10-16 21:19:45 +0000135 return NULL;
Guido van Rossumfb221561997-04-29 15:38:09 +0000136 }
Jeremy Hyltona37e2441998-12-18 22:13:11 +0000137
Jeremy Hylton9714f992001-10-16 21:19:45 +0000138 /* Past the point of no return. From here on out, we need to make sure
139 we clean up mallocs & INCREFs. */
Martin v. Löwis3bd8c1e2001-09-07 16:27:31 +0000140
Jeremy Hylton9d620d02001-10-16 23:02:32 +0000141 zst.zalloc = (alloc_func)NULL;
142 zst.zfree = (free_func)Z_NULL;
143 zst.next_out = (Byte *)output;
144 zst.next_in = (Byte *)input;
145 zst.avail_in = length;
146 err = deflateInit(&zst, level);
Martin v. Löwis3bd8c1e2001-09-07 16:27:31 +0000147
Jeremy Hylton9d620d02001-10-16 23:02:32 +0000148 switch(err) {
Guido van Rossumfb221561997-04-29 15:38:09 +0000149 case(Z_OK):
Jeremy Hylton9714f992001-10-16 21:19:45 +0000150 break;
Guido van Rossumfb221561997-04-29 15:38:09 +0000151 case(Z_MEM_ERROR):
Jeremy Hylton9714f992001-10-16 21:19:45 +0000152 PyErr_SetString(PyExc_MemoryError,
153 "Out of memory while compressing data");
Jeremy Hylton9d620d02001-10-16 23:02:32 +0000154 goto error;
Guido van Rossumfb221561997-04-29 15:38:09 +0000155 case(Z_STREAM_ERROR):
Jeremy Hylton9714f992001-10-16 21:19:45 +0000156 PyErr_SetString(ZlibError,
157 "Bad compression level");
Jeremy Hylton9d620d02001-10-16 23:02:32 +0000158 goto error;
Jeremy Hylton0965e082001-10-16 21:56:09 +0000159 default:
Guido van Rossumfb221561997-04-29 15:38:09 +0000160 deflateEnd(&zst);
Jeremy Hylton0965e082001-10-16 21:56:09 +0000161 zlib_error(zst, err, "while compressing data");
Jeremy Hylton9d620d02001-10-16 23:02:32 +0000162 goto error;
Guido van Rossumfb221561997-04-29 15:38:09 +0000163 }
Martin v. Löwis3bd8c1e2001-09-07 16:27:31 +0000164
Jeremy Hylton9d620d02001-10-16 23:02:32 +0000165 Py_BEGIN_ALLOW_THREADS;
166 err = deflate(&zst, Z_FINISH);
167 Py_END_ALLOW_THREADS;
Jeremy Hylton9714f992001-10-16 21:19:45 +0000168
Jeremy Hylton9d620d02001-10-16 23:02:32 +0000169 if (err != Z_STREAM_END) {
170 zlib_error(zst, err, "while compressing data");
171 deflateEnd(&zst);
172 goto error;
173 }
Tim Peters977e5402001-10-17 03:57:20 +0000174
Jeremy Hylton9d620d02001-10-16 23:02:32 +0000175 err=deflateEnd(&zst);
176 if (err == Z_OK)
Guido van Rossum776152b2007-05-22 22:44:07 +0000177 ReturnVal = PyBytes_FromStringAndSize((char *)output,
178 zst.total_out);
Tim Peters977e5402001-10-17 03:57:20 +0000179 else
Jeremy Hylton9d620d02001-10-16 23:02:32 +0000180 zlib_error(zst, err, "while finishing compression");
Martin v. Löwis3bd8c1e2001-09-07 16:27:31 +0000181
Jeremy Hylton9d620d02001-10-16 23:02:32 +0000182 error:
Jeremy Hylton9714f992001-10-16 21:19:45 +0000183 free(output);
Martin v. Löwis3bd8c1e2001-09-07 16:27:31 +0000184
Jeremy Hylton9714f992001-10-16 21:19:45 +0000185 return ReturnVal;
Guido van Rossumfb221561997-04-29 15:38:09 +0000186}
187
Martin v. Löwis14f8b4c2002-06-13 20:33:02 +0000188PyDoc_STRVAR(decompress__doc__,
Tim Petersadbd35b2001-10-17 04:16:15 +0000189"decompress(string[, wbits[, bufsize]]) -- Return decompressed string.\n"
190"\n"
191"Optional arg wbits is the window buffer size. Optional arg bufsize is\n"
Martin v. Löwis14f8b4c2002-06-13 20:33:02 +0000192"the initial output buffer size.");
Guido van Rossum3c540301997-06-03 22:21:03 +0000193
Guido van Rossumfb221561997-04-29 15:38:09 +0000194static PyObject *
Peter Schneider-Kampa788a7f2000-07-10 09:57:19 +0000195PyZlib_decompress(PyObject *self, PyObject *args)
Guido van Rossumfb221561997-04-29 15:38:09 +0000196{
Jeremy Hylton9714f992001-10-16 21:19:45 +0000197 PyObject *result_str;
198 Byte *input;
199 int length, err;
200 int wsize=DEF_WBITS, r_strlen=DEFAULTALLOC;
201 z_stream zst;
Martin v. Löwis3bd8c1e2001-09-07 16:27:31 +0000202
Tim Peters977e5402001-10-17 03:57:20 +0000203 if (!PyArg_ParseTuple(args, "s#|ii:decompress",
Jeremy Hyltonba3dd992001-10-16 23:26:08 +0000204 &input, &length, &wsize, &r_strlen))
Jeremy Hylton9714f992001-10-16 21:19:45 +0000205 return NULL;
Jeremy Hyltoncb914041997-09-04 23:39:23 +0000206
Jeremy Hylton9714f992001-10-16 21:19:45 +0000207 if (r_strlen <= 0)
208 r_strlen = 1;
Jeremy Hyltona37e2441998-12-18 22:13:11 +0000209
Jeremy Hylton9714f992001-10-16 21:19:45 +0000210 zst.avail_in = length;
211 zst.avail_out = r_strlen;
Martin v. Löwis3bd8c1e2001-09-07 16:27:31 +0000212
Guido van Rossum776152b2007-05-22 22:44:07 +0000213 if (!(result_str = PyBytes_FromStringAndSize(NULL, r_strlen)))
Jeremy Hylton9714f992001-10-16 21:19:45 +0000214 return NULL;
Martin v. Löwis3bd8c1e2001-09-07 16:27:31 +0000215
Jeremy Hylton9714f992001-10-16 21:19:45 +0000216 zst.zalloc = (alloc_func)NULL;
217 zst.zfree = (free_func)Z_NULL;
Guido van Rossum776152b2007-05-22 22:44:07 +0000218 zst.next_out = (Byte *)PyBytes_AS_STRING(result_str);
Jeremy Hylton9714f992001-10-16 21:19:45 +0000219 zst.next_in = (Byte *)input;
220 err = inflateInit2(&zst, wsize);
Martin v. Löwis3bd8c1e2001-09-07 16:27:31 +0000221
Jeremy Hylton9714f992001-10-16 21:19:45 +0000222 switch(err) {
Guido van Rossumfb221561997-04-29 15:38:09 +0000223 case(Z_OK):
Jeremy Hylton9714f992001-10-16 21:19:45 +0000224 break;
Tim Peters977e5402001-10-17 03:57:20 +0000225 case(Z_MEM_ERROR):
Jeremy Hylton9714f992001-10-16 21:19:45 +0000226 PyErr_SetString(PyExc_MemoryError,
227 "Out of memory while decompressing data");
Jeremy Hylton9d620d02001-10-16 23:02:32 +0000228 goto error;
Jeremy Hylton0965e082001-10-16 21:56:09 +0000229 default:
Guido van Rossumfb221561997-04-29 15:38:09 +0000230 inflateEnd(&zst);
Jeremy Hylton0965e082001-10-16 21:56:09 +0000231 zlib_error(zst, err, "while preparing to decompress data");
Jeremy Hylton9d620d02001-10-16 23:02:32 +0000232 goto error;
Guido van Rossumfb221561997-04-29 15:38:09 +0000233 }
Martin v. Löwis3bd8c1e2001-09-07 16:27:31 +0000234
Jeremy Hylton9714f992001-10-16 21:19:45 +0000235 do {
Jeremy Hylton9714f992001-10-16 21:19:45 +0000236 Py_BEGIN_ALLOW_THREADS
237 err=inflate(&zst, Z_FINISH);
238 Py_END_ALLOW_THREADS
Martin v. Löwis3bd8c1e2001-09-07 16:27:31 +0000239
Jeremy Hylton9714f992001-10-16 21:19:45 +0000240 switch(err) {
241 case(Z_STREAM_END):
Jeremy Hylton41b9f001997-08-13 23:19:55 +0000242 break;
Guido van Rossum115f5171998-04-23 20:22:11 +0000243 case(Z_BUF_ERROR):
Andrew M. Kuchlingd9238312000-10-09 14:18:10 +0000244 /*
245 * If there is at least 1 byte of room according to zst.avail_out
246 * and we get this error, assume that it means zlib cannot
247 * process the inflate call() due to an error in the data.
248 */
Jeremy Hylton0965e082001-10-16 21:56:09 +0000249 if (zst.avail_out > 0) {
Jeremy Hylton9714f992001-10-16 21:19:45 +0000250 PyErr_Format(ZlibError, "Error %i while decompressing data",
251 err);
252 inflateEnd(&zst);
Jeremy Hylton9d620d02001-10-16 23:02:32 +0000253 goto error;
Jeremy Hylton9714f992001-10-16 21:19:45 +0000254 }
Andrew M. Kuchlingd9238312000-10-09 14:18:10 +0000255 /* fall through */
256 case(Z_OK):
Jeremy Hylton41b9f001997-08-13 23:19:55 +0000257 /* need more memory */
Guido van Rossum776152b2007-05-22 22:44:07 +0000258 if (PyBytes_Resize(result_str, r_strlen << 1) < 0) {
Jeremy Hylton9714f992001-10-16 21:19:45 +0000259 inflateEnd(&zst);
Jeremy Hylton9d620d02001-10-16 23:02:32 +0000260 goto error;
Jeremy Hylton9714f992001-10-16 21:19:45 +0000261 }
Guido van Rossum776152b2007-05-22 22:44:07 +0000262 zst.next_out =
263 (unsigned char *)PyBytes_AS_STRING(result_str) + r_strlen;
Jeremy Hylton9714f992001-10-16 21:19:45 +0000264 zst.avail_out = r_strlen;
Jeremy Hylton41b9f001997-08-13 23:19:55 +0000265 r_strlen = r_strlen << 1;
266 break;
Jeremy Hylton0965e082001-10-16 21:56:09 +0000267 default:
Jeremy Hylton9714f992001-10-16 21:19:45 +0000268 inflateEnd(&zst);
Jeremy Hylton0965e082001-10-16 21:56:09 +0000269 zlib_error(zst, err, "while decompressing data");
Jeremy Hylton9d620d02001-10-16 23:02:32 +0000270 goto error;
Jeremy Hylton9714f992001-10-16 21:19:45 +0000271 }
272 } while (err != Z_STREAM_END);
Martin v. Löwis3bd8c1e2001-09-07 16:27:31 +0000273
Jeremy Hylton9d620d02001-10-16 23:02:32 +0000274 err = inflateEnd(&zst);
275 if (err != Z_OK) {
276 zlib_error(zst, err, "while finishing data decompression");
Jeremy Hyltonba3dd992001-10-16 23:26:08 +0000277 goto error;
Guido van Rossumfb221561997-04-29 15:38:09 +0000278 }
Martin v. Löwis3bd8c1e2001-09-07 16:27:31 +0000279
Guido van Rossum776152b2007-05-22 22:44:07 +0000280 if (PyBytes_Resize(result_str, zst.total_out) < 0)
281 goto error;
282
Jeremy Hylton9714f992001-10-16 21:19:45 +0000283 return result_str;
Jeremy Hylton9d620d02001-10-16 23:02:32 +0000284
285 error:
Jeremy Hylton9d620d02001-10-16 23:02:32 +0000286 Py_XDECREF(result_str);
287 return NULL;
Guido van Rossumfb221561997-04-29 15:38:09 +0000288}
289
290static PyObject *
Peter Schneider-Kampa788a7f2000-07-10 09:57:19 +0000291PyZlib_compressobj(PyObject *selfptr, PyObject *args)
Guido van Rossumfb221561997-04-29 15:38:09 +0000292{
Jeremy Hylton499000002001-10-16 21:59:35 +0000293 compobject *self;
294 int level=Z_DEFAULT_COMPRESSION, method=DEFLATED;
295 int wbits=MAX_WBITS, memLevel=DEF_MEM_LEVEL, strategy=0, err;
Jeremy Hylton41b9f001997-08-13 23:19:55 +0000296
Jeremy Hylton499000002001-10-16 21:59:35 +0000297 if (!PyArg_ParseTuple(args, "|iiiii:compressobj", &level, &method, &wbits,
298 &memLevel, &strategy))
299 return NULL;
Jeremy Hylton41b9f001997-08-13 23:19:55 +0000300
Jeremy Hylton499000002001-10-16 21:59:35 +0000301 self = newcompobject(&Comptype);
Tim Peters977e5402001-10-17 03:57:20 +0000302 if (self==NULL)
Jeremy Hylton499000002001-10-16 21:59:35 +0000303 return(NULL);
304 self->zst.zalloc = (alloc_func)NULL;
305 self->zst.zfree = (free_func)Z_NULL;
Andrew M. Kuchling3b585b32004-12-28 20:10:48 +0000306 self->zst.next_in = NULL;
307 self->zst.avail_in = 0;
Jeremy Hylton499000002001-10-16 21:59:35 +0000308 err = deflateInit2(&self->zst, level, method, wbits, memLevel, strategy);
309 switch(err) {
Guido van Rossumfb221561997-04-29 15:38:09 +0000310 case (Z_OK):
Jeremy Hylton499000002001-10-16 21:59:35 +0000311 self->is_initialised = 1;
312 return (PyObject*)self;
Guido van Rossumfb221561997-04-29 15:38:09 +0000313 case (Z_MEM_ERROR):
Jeremy Hylton499000002001-10-16 21:59:35 +0000314 Py_DECREF(self);
315 PyErr_SetString(PyExc_MemoryError,
316 "Can't allocate memory for compression object");
317 return NULL;
Guido van Rossumfb221561997-04-29 15:38:09 +0000318 case(Z_STREAM_ERROR):
Jeremy Hylton499000002001-10-16 21:59:35 +0000319 Py_DECREF(self);
Jeremy Hylton9d620d02001-10-16 23:02:32 +0000320 PyErr_SetString(PyExc_ValueError, "Invalid initialization option");
Jeremy Hylton499000002001-10-16 21:59:35 +0000321 return NULL;
Guido van Rossumfb221561997-04-29 15:38:09 +0000322 default:
Jeremy Hylton0965e082001-10-16 21:56:09 +0000323 zlib_error(self->zst, err, "while creating compression object");
Andrew M. Kuchling1c7aaa21999-01-29 21:49:34 +0000324 Py_DECREF(self);
Guido van Rossumfb221561997-04-29 15:38:09 +0000325 return NULL;
Guido van Rossumfb221561997-04-29 15:38:09 +0000326 }
327}
328
329static PyObject *
Peter Schneider-Kampa788a7f2000-07-10 09:57:19 +0000330PyZlib_decompressobj(PyObject *selfptr, PyObject *args)
Guido van Rossumfb221561997-04-29 15:38:09 +0000331{
Jeremy Hylton499000002001-10-16 21:59:35 +0000332 int wbits=DEF_WBITS, err;
333 compobject *self;
334 if (!PyArg_ParseTuple(args, "|i:decompressobj", &wbits))
335 return NULL;
336
337 self = newcompobject(&Decomptype);
Tim Peters977e5402001-10-17 03:57:20 +0000338 if (self == NULL)
Jeremy Hylton499000002001-10-16 21:59:35 +0000339 return(NULL);
340 self->zst.zalloc = (alloc_func)NULL;
341 self->zst.zfree = (free_func)Z_NULL;
Andrew M. Kuchling3b585b32004-12-28 20:10:48 +0000342 self->zst.next_in = NULL;
343 self->zst.avail_in = 0;
Jeremy Hylton499000002001-10-16 21:59:35 +0000344 err = inflateInit2(&self->zst, wbits);
345 switch(err) {
Guido van Rossumfb221561997-04-29 15:38:09 +0000346 case (Z_OK):
Jeremy Hylton499000002001-10-16 21:59:35 +0000347 self->is_initialised = 1;
348 return (PyObject*)self;
Jeremy Hyltoncb914041997-09-04 23:39:23 +0000349 case(Z_STREAM_ERROR):
Jeremy Hylton499000002001-10-16 21:59:35 +0000350 Py_DECREF(self);
Jeremy Hylton9d620d02001-10-16 23:02:32 +0000351 PyErr_SetString(PyExc_ValueError, "Invalid initialization option");
Jeremy Hylton499000002001-10-16 21:59:35 +0000352 return NULL;
Guido van Rossumfb221561997-04-29 15:38:09 +0000353 case (Z_MEM_ERROR):
Jeremy Hylton499000002001-10-16 21:59:35 +0000354 Py_DECREF(self);
355 PyErr_SetString(PyExc_MemoryError,
356 "Can't allocate memory for decompression object");
357 return NULL;
Guido van Rossumfb221561997-04-29 15:38:09 +0000358 default:
Jeremy Hylton0965e082001-10-16 21:56:09 +0000359 zlib_error(self->zst, err, "while creating decompression object");
Andrew M. Kuchling1c7aaa21999-01-29 21:49:34 +0000360 Py_DECREF(self);
Guido van Rossumfb221561997-04-29 15:38:09 +0000361 return NULL;
Jeremy Hylton499000002001-10-16 21:59:35 +0000362 }
Guido van Rossumfb221561997-04-29 15:38:09 +0000363}
364
365static void
Peter Schneider-Kampa788a7f2000-07-10 09:57:19 +0000366Comp_dealloc(compobject *self)
Guido van Rossumfb221561997-04-29 15:38:09 +0000367{
Andrew M. Kuchling1c7aaa21999-01-29 21:49:34 +0000368 if (self->is_initialised)
Jeremy Hylton499000002001-10-16 21:59:35 +0000369 deflateEnd(&self->zst);
Andrew M. Kuchlingb95227d1999-03-25 21:21:08 +0000370 Py_XDECREF(self->unused_data);
Jeremy Hylton511e2ca2001-10-16 20:39:49 +0000371 Py_XDECREF(self->unconsumed_tail);
Guido van Rossumb18618d2000-05-03 23:44:39 +0000372 PyObject_Del(self);
Guido van Rossumfb221561997-04-29 15:38:09 +0000373}
374
375static void
Peter Schneider-Kampa788a7f2000-07-10 09:57:19 +0000376Decomp_dealloc(compobject *self)
Guido van Rossumfb221561997-04-29 15:38:09 +0000377{
Andrew M. Kuchling9aff4a22001-02-21 02:15:56 +0000378 if (self->is_initialised)
Jeremy Hylton499000002001-10-16 21:59:35 +0000379 inflateEnd(&self->zst);
Andrew M. Kuchlingb95227d1999-03-25 21:21:08 +0000380 Py_XDECREF(self->unused_data);
Jeremy Hylton511e2ca2001-10-16 20:39:49 +0000381 Py_XDECREF(self->unconsumed_tail);
Guido van Rossumb18618d2000-05-03 23:44:39 +0000382 PyObject_Del(self);
Guido van Rossumfb221561997-04-29 15:38:09 +0000383}
384
Martin v. Löwis14f8b4c2002-06-13 20:33:02 +0000385PyDoc_STRVAR(comp_compress__doc__,
Tim Petersadbd35b2001-10-17 04:16:15 +0000386"compress(data) -- Return a string containing data compressed.\n"
387"\n"
Guido van Rossum3c540301997-06-03 22:21:03 +0000388"After calling this function, some of the input data may still\n"
389"be stored in internal buffers for later processing.\n"
Martin v. Löwis14f8b4c2002-06-13 20:33:02 +0000390"Call the flush() method to clear these buffers.");
Guido van Rossum3c540301997-06-03 22:21:03 +0000391
392
Guido van Rossumfb221561997-04-29 15:38:09 +0000393static PyObject *
Peter Schneider-Kampa788a7f2000-07-10 09:57:19 +0000394PyZlib_objcompress(compobject *self, PyObject *args)
Guido van Rossumfb221561997-04-29 15:38:09 +0000395{
Jeremy Hylton9714f992001-10-16 21:19:45 +0000396 int err, inplen, length = DEFAULTALLOC;
397 PyObject *RetVal;
398 Byte *input;
399 unsigned long start_total_out;
Tim Peters977e5402001-10-17 03:57:20 +0000400
Jeremy Hyltonba3dd992001-10-16 23:26:08 +0000401 if (!PyArg_ParseTuple(args, "s#:compress", &input, &inplen))
Jeremy Hylton9714f992001-10-16 21:19:45 +0000402 return NULL;
Martin v. Löwis3bd8c1e2001-09-07 16:27:31 +0000403
Guido van Rossum776152b2007-05-22 22:44:07 +0000404 if (!(RetVal = PyBytes_FromStringAndSize(NULL, length)))
Jeremy Hylton9714f992001-10-16 21:19:45 +0000405 return NULL;
Jeremy Hylton9714f992001-10-16 21:19:45 +0000406
407 ENTER_ZLIB
408
Jeremy Hylton9714f992001-10-16 21:19:45 +0000409 start_total_out = self->zst.total_out;
410 self->zst.avail_in = inplen;
411 self->zst.next_in = input;
Andrew M. Kuchling9aff4a22001-02-21 02:15:56 +0000412 self->zst.avail_out = length;
Guido van Rossum776152b2007-05-22 22:44:07 +0000413 self->zst.next_out = (unsigned char *)PyBytes_AS_STRING(RetVal);
Jeremy Hylton9714f992001-10-16 21:19:45 +0000414
Martin v. Löwis3bd8c1e2001-09-07 16:27:31 +0000415 Py_BEGIN_ALLOW_THREADS
Andrew M. Kuchling9aff4a22001-02-21 02:15:56 +0000416 err = deflate(&(self->zst), Z_NO_FLUSH);
Martin v. Löwis3bd8c1e2001-09-07 16:27:31 +0000417 Py_END_ALLOW_THREADS
Martin v. Löwis3bd8c1e2001-09-07 16:27:31 +0000418
Jeremy Hylton9714f992001-10-16 21:19:45 +0000419 /* while Z_OK and the output buffer is full, there might be more output,
420 so extend the output buffer and try again */
421 while (err == Z_OK && self->zst.avail_out == 0) {
Guido van Rossum776152b2007-05-22 22:44:07 +0000422 if (PyBytes_Resize(RetVal, length << 1) < 0) {
423 Py_DECREF(RetVal);
424 RetVal = NULL;
Jeremy Hylton9d620d02001-10-16 23:02:32 +0000425 goto error;
Guido van Rossum776152b2007-05-22 22:44:07 +0000426 }
427 self->zst.next_out =
428 (unsigned char *)PyBytes_AS_STRING(RetVal) + length;
Jeremy Hylton9714f992001-10-16 21:19:45 +0000429 self->zst.avail_out = length;
430 length = length << 1;
Tim Peters977e5402001-10-17 03:57:20 +0000431
Jeremy Hylton9714f992001-10-16 21:19:45 +0000432 Py_BEGIN_ALLOW_THREADS
433 err = deflate(&(self->zst), Z_NO_FLUSH);
434 Py_END_ALLOW_THREADS
Martin v. Löwis3bd8c1e2001-09-07 16:27:31 +0000435 }
Tim Peters977e5402001-10-17 03:57:20 +0000436 /* We will only get Z_BUF_ERROR if the output buffer was full but
Jeremy Hylton9714f992001-10-16 21:19:45 +0000437 there wasn't more output when we tried again, so it is not an error
Tim Peters977e5402001-10-17 03:57:20 +0000438 condition.
439 */
Martin v. Löwis3bd8c1e2001-09-07 16:27:31 +0000440
Jeremy Hylton9d620d02001-10-16 23:02:32 +0000441 if (err != Z_OK && err != Z_BUF_ERROR) {
442 zlib_error(self->zst, err, "while compressing");
443 Py_DECREF(RetVal);
444 RetVal = NULL;
445 goto error;
Jeremy Hylton9714f992001-10-16 21:19:45 +0000446 }
Guido van Rossum776152b2007-05-22 22:44:07 +0000447 if (PyBytes_Resize(RetVal, self->zst.total_out - start_total_out) < 0) {
448 Py_DECREF(RetVal);
449 RetVal = NULL;
450 }
Martin v. Löwis3bd8c1e2001-09-07 16:27:31 +0000451
Jeremy Hylton9d620d02001-10-16 23:02:32 +0000452 error:
Jeremy Hylton9714f992001-10-16 21:19:45 +0000453 LEAVE_ZLIB
Jeremy Hylton9714f992001-10-16 21:19:45 +0000454 return RetVal;
Guido van Rossumfb221561997-04-29 15:38:09 +0000455}
456
Martin v. Löwis14f8b4c2002-06-13 20:33:02 +0000457PyDoc_STRVAR(decomp_decompress__doc__,
Tim Petersadbd35b2001-10-17 04:16:15 +0000458"decompress(data, max_length) -- Return a string containing the decompressed\n"
459"version of the data.\n"
460"\n"
461"After calling this function, some of the input data may still be stored in\n"
462"internal buffers for later processing.\n"
Jeremy Hylton511e2ca2001-10-16 20:39:49 +0000463"Call the flush() method to clear these buffers.\n"
464"If the max_length parameter is specified then the return value will be\n"
465"no longer than max_length. Unconsumed input data will be stored in\n"
Martin v. Löwis14f8b4c2002-06-13 20:33:02 +0000466"the unconsumed_tail attribute.");
Guido van Rossum3c540301997-06-03 22:21:03 +0000467
Guido van Rossumfb221561997-04-29 15:38:09 +0000468static PyObject *
Peter Schneider-Kampa788a7f2000-07-10 09:57:19 +0000469PyZlib_objdecompress(compobject *self, PyObject *args)
Guido van Rossumfb221561997-04-29 15:38:09 +0000470{
Jeremy Hylton9714f992001-10-16 21:19:45 +0000471 int err, inplen, old_length, length = DEFAULTALLOC;
472 int max_length = 0;
473 PyObject *RetVal;
474 Byte *input;
475 unsigned long start_total_out;
Jeremy Hyltoncb914041997-09-04 23:39:23 +0000476
Tim Peters977e5402001-10-17 03:57:20 +0000477 if (!PyArg_ParseTuple(args, "s#|i:decompress", &input,
Jeremy Hyltonba3dd992001-10-16 23:26:08 +0000478 &inplen, &max_length))
Jeremy Hylton9714f992001-10-16 21:19:45 +0000479 return NULL;
480 if (max_length < 0) {
481 PyErr_SetString(PyExc_ValueError,
482 "max_length must be greater than zero");
483 return NULL;
Andrew M. Kuchling9aff4a22001-02-21 02:15:56 +0000484 }
Jeremy Hylton9714f992001-10-16 21:19:45 +0000485
Jeremy Hylton9714f992001-10-16 21:19:45 +0000486 /* limit amount of data allocated to max_length */
Tim Peters977e5402001-10-17 03:57:20 +0000487 if (max_length && length > max_length)
Jeremy Hylton9714f992001-10-16 21:19:45 +0000488 length = max_length;
Guido van Rossum776152b2007-05-22 22:44:07 +0000489 if (!(RetVal = PyBytes_FromStringAndSize(NULL, length)))
Jeremy Hylton9714f992001-10-16 21:19:45 +0000490 return NULL;
Jeremy Hylton9714f992001-10-16 21:19:45 +0000491
492 ENTER_ZLIB
Jeremy Hylton9714f992001-10-16 21:19:45 +0000493
Jeremy Hylton9714f992001-10-16 21:19:45 +0000494 start_total_out = self->zst.total_out;
495 self->zst.avail_in = inplen;
496 self->zst.next_in = input;
497 self->zst.avail_out = length;
Guido van Rossum776152b2007-05-22 22:44:07 +0000498 self->zst.next_out = (unsigned char *)PyBytes_AS_STRING(RetVal);
Jeremy Hylton511e2ca2001-10-16 20:39:49 +0000499
Martin v. Löwis3bd8c1e2001-09-07 16:27:31 +0000500 Py_BEGIN_ALLOW_THREADS
Andrew M. Kuchling9aff4a22001-02-21 02:15:56 +0000501 err = inflate(&(self->zst), Z_SYNC_FLUSH);
Martin v. Löwis3bd8c1e2001-09-07 16:27:31 +0000502 Py_END_ALLOW_THREADS
Martin v. Löwis3bd8c1e2001-09-07 16:27:31 +0000503
Jeremy Hylton9714f992001-10-16 21:19:45 +0000504 /* While Z_OK and the output buffer is full, there might be more output.
505 So extend the output buffer and try again.
506 */
Tim Peters977e5402001-10-17 03:57:20 +0000507 while (err == Z_OK && self->zst.avail_out == 0) {
Jeremy Hylton9714f992001-10-16 21:19:45 +0000508 /* If max_length set, don't continue decompressing if we've already
509 reached the limit.
510 */
511 if (max_length && length >= max_length)
512 break;
Jeremy Hylton511e2ca2001-10-16 20:39:49 +0000513
Jeremy Hylton9714f992001-10-16 21:19:45 +0000514 /* otherwise, ... */
515 old_length = length;
516 length = length << 1;
Tim Peters977e5402001-10-17 03:57:20 +0000517 if (max_length && length > max_length)
Jeremy Hylton9714f992001-10-16 21:19:45 +0000518 length = max_length;
519
Guido van Rossum776152b2007-05-22 22:44:07 +0000520 if (PyBytes_Resize(RetVal, length) < 0) {
521 Py_DECREF(RetVal);
522 RetVal = NULL;
Jeremy Hylton9d620d02001-10-16 23:02:32 +0000523 goto error;
Guido van Rossum776152b2007-05-22 22:44:07 +0000524 }
525 self->zst.next_out =
526 (unsigned char *)PyBytes_AS_STRING(RetVal) + old_length;
Jeremy Hylton9714f992001-10-16 21:19:45 +0000527 self->zst.avail_out = length - old_length;
528
529 Py_BEGIN_ALLOW_THREADS
530 err = inflate(&(self->zst), Z_SYNC_FLUSH);
531 Py_END_ALLOW_THREADS
Guido van Rossumfb221561997-04-29 15:38:09 +0000532 }
Jeremy Hylton9714f992001-10-16 21:19:45 +0000533
Andrew M. Kuchling3b585b32004-12-28 20:10:48 +0000534 /* Not all of the compressed data could be accommodated in the output buffer
Jeremy Hylton9714f992001-10-16 21:19:45 +0000535 of specified size. Return the unconsumed tail in an attribute.*/
536 if(max_length) {
537 Py_DECREF(self->unconsumed_tail);
Guido van Rossum776152b2007-05-22 22:44:07 +0000538 self->unconsumed_tail = PyBytes_FromStringAndSize((char *)self->zst.next_in,
Jeremy Hylton9714f992001-10-16 21:19:45 +0000539 self->zst.avail_in);
Jeremy Hylton9d620d02001-10-16 23:02:32 +0000540 if(!self->unconsumed_tail) {
541 Py_DECREF(RetVal);
542 RetVal = NULL;
543 goto error;
544 }
Martin v. Löwis3bd8c1e2001-09-07 16:27:31 +0000545 }
Martin v. Löwis3bd8c1e2001-09-07 16:27:31 +0000546
Tim Peters977e5402001-10-17 03:57:20 +0000547 /* The end of the compressed data has been reached, so set the
548 unused_data attribute to a string containing the remainder of the
549 data in the string. Note that this is also a logical place to call
Jeremy Hylton9714f992001-10-16 21:19:45 +0000550 inflateEnd, but the old behaviour of only calling it on flush() is
551 preserved.
552 */
Jeremy Hylton9d620d02001-10-16 23:02:32 +0000553 if (err == Z_STREAM_END) {
554 Py_XDECREF(self->unused_data); /* Free original empty string */
Guido van Rossum776152b2007-05-22 22:44:07 +0000555 self->unused_data = PyBytes_FromStringAndSize(
Jeremy Hylton9d620d02001-10-16 23:02:32 +0000556 (char *)self->zst.next_in, self->zst.avail_in);
557 if (self->unused_data == NULL) {
Jeremy Hylton9714f992001-10-16 21:19:45 +0000558 Py_DECREF(RetVal);
Jeremy Hylton9d620d02001-10-16 23:02:32 +0000559 goto error;
Jeremy Hylton9714f992001-10-16 21:19:45 +0000560 }
Tim Peters977e5402001-10-17 03:57:20 +0000561 /* We will only get Z_BUF_ERROR if the output buffer was full
Jeremy Hylton9d620d02001-10-16 23:02:32 +0000562 but there wasn't more output when we tried again, so it is
563 not an error condition.
564 */
565 } else if (err != Z_OK && err != Z_BUF_ERROR) {
566 zlib_error(self->zst, err, "while decompressing");
567 Py_DECREF(RetVal);
568 RetVal = NULL;
569 goto error;
Jeremy Hylton9714f992001-10-16 21:19:45 +0000570 }
Martin v. Löwis3bd8c1e2001-09-07 16:27:31 +0000571
Guido van Rossum776152b2007-05-22 22:44:07 +0000572 if (PyBytes_Resize(RetVal, self->zst.total_out - start_total_out) < 0) {
573 Py_DECREF(RetVal);
574 RetVal = NULL;
575 }
Martin v. Löwis3bd8c1e2001-09-07 16:27:31 +0000576
Jeremy Hylton9d620d02001-10-16 23:02:32 +0000577 error:
Jeremy Hylton9714f992001-10-16 21:19:45 +0000578 LEAVE_ZLIB
579
580 return RetVal;
Guido van Rossumfb221561997-04-29 15:38:09 +0000581}
582
Martin v. Löwis14f8b4c2002-06-13 20:33:02 +0000583PyDoc_STRVAR(comp_flush__doc__,
Jeremy Hyltona37e2441998-12-18 22:13:11 +0000584"flush( [mode] ) -- Return a string containing any remaining compressed data.\n"
Tim Petersadbd35b2001-10-17 04:16:15 +0000585"\n"
586"mode can be one of the constants Z_SYNC_FLUSH, Z_FULL_FLUSH, Z_FINISH; the\n"
Jeremy Hyltona37e2441998-12-18 22:13:11 +0000587"default value used when mode is not specified is Z_FINISH.\n"
588"If mode == Z_FINISH, the compressor object can no longer be used after\n"
Martin v. Löwis14f8b4c2002-06-13 20:33:02 +0000589"calling the flush() method. Otherwise, more data can still be compressed.");
Guido van Rossum3c540301997-06-03 22:21:03 +0000590
Guido van Rossumfb221561997-04-29 15:38:09 +0000591static PyObject *
Peter Schneider-Kampa788a7f2000-07-10 09:57:19 +0000592PyZlib_flush(compobject *self, PyObject *args)
Guido van Rossumfb221561997-04-29 15:38:09 +0000593{
Jeremy Hylton9714f992001-10-16 21:19:45 +0000594 int err, length = DEFAULTALLOC;
595 PyObject *RetVal;
596 int flushmode = Z_FINISH;
597 unsigned long start_total_out;
Jeremy Hyltona37e2441998-12-18 22:13:11 +0000598
Jeremy Hylton9714f992001-10-16 21:19:45 +0000599 if (!PyArg_ParseTuple(args, "|i:flush", &flushmode))
600 return NULL;
Jeremy Hyltona37e2441998-12-18 22:13:11 +0000601
Jeremy Hylton9714f992001-10-16 21:19:45 +0000602 /* Flushing with Z_NO_FLUSH is a no-op, so there's no point in
603 doing any work at all; just return an empty string. */
604 if (flushmode == Z_NO_FLUSH) {
Guido van Rossum776152b2007-05-22 22:44:07 +0000605 return PyBytes_FromStringAndSize(NULL, 0);
Andrew M. Kuchling9aff4a22001-02-21 02:15:56 +0000606 }
Jeremy Hylton9714f992001-10-16 21:19:45 +0000607
Guido van Rossum776152b2007-05-22 22:44:07 +0000608 if (!(RetVal = PyBytes_FromStringAndSize(NULL, length)))
Jeremy Hylton9714f992001-10-16 21:19:45 +0000609 return NULL;
Jeremy Hylton9714f992001-10-16 21:19:45 +0000610
611 ENTER_ZLIB
Tim Peters977e5402001-10-17 03:57:20 +0000612
Jeremy Hylton9714f992001-10-16 21:19:45 +0000613 start_total_out = self->zst.total_out;
614 self->zst.avail_in = 0;
Andrew M. Kuchling9aff4a22001-02-21 02:15:56 +0000615 self->zst.avail_out = length;
Guido van Rossum776152b2007-05-22 22:44:07 +0000616 self->zst.next_out = (unsigned char *)PyBytes_AS_STRING(RetVal);
Martin v. Löwis3bd8c1e2001-09-07 16:27:31 +0000617
618 Py_BEGIN_ALLOW_THREADS
Andrew M. Kuchling9aff4a22001-02-21 02:15:56 +0000619 err = deflate(&(self->zst), flushmode);
Martin v. Löwis3bd8c1e2001-09-07 16:27:31 +0000620 Py_END_ALLOW_THREADS
Martin v. Löwis3bd8c1e2001-09-07 16:27:31 +0000621
Jeremy Hylton9714f992001-10-16 21:19:45 +0000622 /* while Z_OK and the output buffer is full, there might be more output,
623 so extend the output buffer and try again */
624 while (err == Z_OK && self->zst.avail_out == 0) {
Guido van Rossum776152b2007-05-22 22:44:07 +0000625 if (PyBytes_Resize(RetVal, length << 1) < 0) {
626 Py_DECREF(RetVal);
627 RetVal = NULL;
Jeremy Hylton9d620d02001-10-16 23:02:32 +0000628 goto error;
Guido van Rossum776152b2007-05-22 22:44:07 +0000629 }
630 self->zst.next_out =
631 (unsigned char *)PyBytes_AS_STRING(RetVal) + length;
Jeremy Hylton9714f992001-10-16 21:19:45 +0000632 self->zst.avail_out = length;
633 length = length << 1;
Martin v. Löwis3bd8c1e2001-09-07 16:27:31 +0000634
Jeremy Hylton9714f992001-10-16 21:19:45 +0000635 Py_BEGIN_ALLOW_THREADS
636 err = deflate(&(self->zst), flushmode);
637 Py_END_ALLOW_THREADS
Jeremy Hyltona37e2441998-12-18 22:13:11 +0000638 }
Martin v. Löwis3bd8c1e2001-09-07 16:27:31 +0000639
Jeremy Hylton9714f992001-10-16 21:19:45 +0000640 /* If flushmode is Z_FINISH, we also have to call deflateEnd() to free
Tim Peters977e5402001-10-17 03:57:20 +0000641 various data structures. Note we should only get Z_STREAM_END when
Jeremy Hylton9714f992001-10-16 21:19:45 +0000642 flushmode is Z_FINISH, but checking both for safety*/
Jeremy Hylton9d620d02001-10-16 23:02:32 +0000643 if (err == Z_STREAM_END && flushmode == Z_FINISH) {
644 err = deflateEnd(&(self->zst));
645 if (err != Z_OK) {
646 zlib_error(self->zst, err, "from deflateEnd()");
Jeremy Hylton9714f992001-10-16 21:19:45 +0000647 Py_DECREF(RetVal);
Jeremy Hylton9d620d02001-10-16 23:02:32 +0000648 RetVal = NULL;
649 goto error;
Jeremy Hylton9714f992001-10-16 21:19:45 +0000650 }
Jeremy Hylton9d620d02001-10-16 23:02:32 +0000651 else
652 self->is_initialised = 0;
Tim Peters977e5402001-10-17 03:57:20 +0000653
654 /* We will only get Z_BUF_ERROR if the output buffer was full
655 but there wasn't more output when we tried again, so it is
Jeremy Hylton9d620d02001-10-16 23:02:32 +0000656 not an error condition.
657 */
658 } else if (err!=Z_OK && err!=Z_BUF_ERROR) {
659 zlib_error(self->zst, err, "while flushing");
660 Py_DECREF(RetVal);
661 RetVal = NULL;
Jeremy Hyltonc72737e2002-04-19 14:37:07 +0000662 goto error;
Jeremy Hylton9714f992001-10-16 21:19:45 +0000663 }
Tim Peters977e5402001-10-17 03:57:20 +0000664
Guido van Rossum776152b2007-05-22 22:44:07 +0000665 if (PyBytes_Resize(RetVal, self->zst.total_out - start_total_out) < 0) {
666 Py_DECREF(RetVal);
667 RetVal = NULL;
668 }
Martin v. Löwis3bd8c1e2001-09-07 16:27:31 +0000669
Tim Peters977e5402001-10-17 03:57:20 +0000670 error:
Tim Petersb1a37c02001-10-17 03:56:45 +0000671 LEAVE_ZLIB
Jeremy Hylton9d620d02001-10-16 23:02:32 +0000672
673 return RetVal;
Guido van Rossumfb221561997-04-29 15:38:09 +0000674}
675
Thomas Wouters0e3f5912006-08-11 14:57:12 +0000676#ifdef HAVE_ZLIB_COPY
Thomas Wouters477c8d52006-05-27 19:21:47 +0000677PyDoc_STRVAR(comp_copy__doc__,
678"copy() -- Return a copy of the compression object.");
679
680static PyObject *
681PyZlib_copy(compobject *self)
682{
683 compobject *retval = NULL;
684 int err;
685
686 retval = newcompobject(&Comptype);
687 if (!retval) return NULL;
688
689 /* Copy the zstream state
690 * We use ENTER_ZLIB / LEAVE_ZLIB to make this thread-safe
691 */
692 ENTER_ZLIB
693 err = deflateCopy(&retval->zst, &self->zst);
694 switch(err) {
695 case(Z_OK):
696 break;
697 case(Z_STREAM_ERROR):
698 PyErr_SetString(PyExc_ValueError, "Inconsistent stream state");
699 goto error;
700 case(Z_MEM_ERROR):
701 PyErr_SetString(PyExc_MemoryError,
702 "Can't allocate memory for compression object");
703 goto error;
704 default:
705 zlib_error(self->zst, err, "while copying compression object");
706 goto error;
707 }
708
709 Py_INCREF(self->unused_data);
710 Py_INCREF(self->unconsumed_tail);
711 Py_XDECREF(retval->unused_data);
712 Py_XDECREF(retval->unconsumed_tail);
713 retval->unused_data = self->unused_data;
714 retval->unconsumed_tail = self->unconsumed_tail;
715
716 /* Mark it as being initialized */
717 retval->is_initialised = 1;
718
719 LEAVE_ZLIB
720 return (PyObject *)retval;
721
722error:
723 LEAVE_ZLIB
724 Py_XDECREF(retval);
725 return NULL;
726}
727
728PyDoc_STRVAR(decomp_copy__doc__,
729"copy() -- Return a copy of the decompression object.");
730
731static PyObject *
732PyZlib_uncopy(compobject *self)
733{
734 compobject *retval = NULL;
735 int err;
736
737 retval = newcompobject(&Decomptype);
738 if (!retval) return NULL;
739
740 /* Copy the zstream state
741 * We use ENTER_ZLIB / LEAVE_ZLIB to make this thread-safe
742 */
743 ENTER_ZLIB
744 err = inflateCopy(&retval->zst, &self->zst);
745 switch(err) {
746 case(Z_OK):
747 break;
748 case(Z_STREAM_ERROR):
749 PyErr_SetString(PyExc_ValueError, "Inconsistent stream state");
750 goto error;
751 case(Z_MEM_ERROR):
752 PyErr_SetString(PyExc_MemoryError,
753 "Can't allocate memory for decompression object");
754 goto error;
755 default:
756 zlib_error(self->zst, err, "while copying decompression object");
757 goto error;
758 }
759
760 Py_INCREF(self->unused_data);
761 Py_INCREF(self->unconsumed_tail);
762 Py_XDECREF(retval->unused_data);
763 Py_XDECREF(retval->unconsumed_tail);
764 retval->unused_data = self->unused_data;
765 retval->unconsumed_tail = self->unconsumed_tail;
766
767 /* Mark it as being initialized */
768 retval->is_initialised = 1;
769
770 LEAVE_ZLIB
771 return (PyObject *)retval;
772
773error:
774 LEAVE_ZLIB
775 Py_XDECREF(retval);
776 return NULL;
777}
Thomas Wouters0e3f5912006-08-11 14:57:12 +0000778#endif
Thomas Wouters477c8d52006-05-27 19:21:47 +0000779
Martin v. Löwis14f8b4c2002-06-13 20:33:02 +0000780PyDoc_STRVAR(decomp_flush__doc__,
Thomas Wouters49fd7fa2006-04-21 10:40:58 +0000781"flush( [length] ) -- Return a string containing any remaining\n"
782"decompressed data. length, if given, is the initial size of the\n"
783"output buffer.\n"
Tim Petersadbd35b2001-10-17 04:16:15 +0000784"\n"
Martin v. Löwis14f8b4c2002-06-13 20:33:02 +0000785"The decompressor object can no longer be used after this call.");
Guido van Rossum3c540301997-06-03 22:21:03 +0000786
Guido van Rossumfb221561997-04-29 15:38:09 +0000787static PyObject *
Peter Schneider-Kampa788a7f2000-07-10 09:57:19 +0000788PyZlib_unflush(compobject *self, PyObject *args)
Guido van Rossumfb221561997-04-29 15:38:09 +0000789{
Guido van Rossum7d9ea502003-02-03 20:45:52 +0000790 int err, length = DEFAULTALLOC;
Jeremy Hylton9d620d02001-10-16 23:02:32 +0000791 PyObject * retval = NULL;
Guido van Rossum7d9ea502003-02-03 20:45:52 +0000792 unsigned long start_total_out;
Tim Peters977e5402001-10-17 03:57:20 +0000793
Guido van Rossum7d9ea502003-02-03 20:45:52 +0000794 if (!PyArg_ParseTuple(args, "|i:flush", &length))
Jeremy Hylton9714f992001-10-16 21:19:45 +0000795 return NULL;
Guido van Rossum776152b2007-05-22 22:44:07 +0000796 if (!(retval = PyBytes_FromStringAndSize(NULL, length)))
Guido van Rossum7d9ea502003-02-03 20:45:52 +0000797 return NULL;
798
Martin v. Löwis3bd8c1e2001-09-07 16:27:31 +0000799
Jeremy Hylton9714f992001-10-16 21:19:45 +0000800 ENTER_ZLIB
Martin v. Löwis3bd8c1e2001-09-07 16:27:31 +0000801
Guido van Rossum7d9ea502003-02-03 20:45:52 +0000802 start_total_out = self->zst.total_out;
803 self->zst.avail_out = length;
Guido van Rossum776152b2007-05-22 22:44:07 +0000804 self->zst.next_out = (Byte *)PyBytes_AS_STRING(retval);
Guido van Rossum7d9ea502003-02-03 20:45:52 +0000805
806 Py_BEGIN_ALLOW_THREADS
807 err = inflate(&(self->zst), Z_FINISH);
808 Py_END_ALLOW_THREADS
809
810 /* while Z_OK and the output buffer is full, there might be more output,
811 so extend the output buffer and try again */
812 while ((err == Z_OK || err == Z_BUF_ERROR) && self->zst.avail_out == 0) {
Guido van Rossum776152b2007-05-22 22:44:07 +0000813 if (PyBytes_Resize(retval, length << 1) < 0) {
814 Py_DECREF(retval);
815 retval = NULL;
Guido van Rossum7d9ea502003-02-03 20:45:52 +0000816 goto error;
Guido van Rossum776152b2007-05-22 22:44:07 +0000817 }
818 self->zst.next_out = (Byte *)PyBytes_AS_STRING(retval) + length;
Guido van Rossum7d9ea502003-02-03 20:45:52 +0000819 self->zst.avail_out = length;
820 length = length << 1;
821
822 Py_BEGIN_ALLOW_THREADS
823 err = inflate(&(self->zst), Z_FINISH);
824 Py_END_ALLOW_THREADS
Jeremy Hylton9714f992001-10-16 21:19:45 +0000825 }
Martin v. Löwis3bd8c1e2001-09-07 16:27:31 +0000826
Guido van Rossum7d9ea502003-02-03 20:45:52 +0000827 /* If flushmode is Z_FINISH, we also have to call deflateEnd() to free
828 various data structures. Note we should only get Z_STREAM_END when
829 flushmode is Z_FINISH */
830 if (err == Z_STREAM_END) {
831 err = inflateEnd(&(self->zst));
832 self->is_initialised = 0;
833 if (err != Z_OK) {
834 zlib_error(self->zst, err, "from inflateEnd()");
835 Py_DECREF(retval);
836 retval = NULL;
837 goto error;
838 }
839 }
Guido van Rossum776152b2007-05-22 22:44:07 +0000840 if (PyBytes_Resize(retval, self->zst.total_out - start_total_out) < 0) {
841 Py_DECREF(retval);
842 retval = NULL;
843 }
Guido van Rossum7d9ea502003-02-03 20:45:52 +0000844
845error:
846
Jeremy Hylton9714f992001-10-16 21:19:45 +0000847 LEAVE_ZLIB
Martin v. Löwis3bd8c1e2001-09-07 16:27:31 +0000848
Jeremy Hylton9714f992001-10-16 21:19:45 +0000849 return retval;
Guido van Rossumfb221561997-04-29 15:38:09 +0000850}
851
852static PyMethodDef comp_methods[] =
853{
Tim Peters977e5402001-10-17 03:57:20 +0000854 {"compress", (binaryfunc)PyZlib_objcompress, METH_VARARGS,
Jeremy Hylton9714f992001-10-16 21:19:45 +0000855 comp_compress__doc__},
Tim Peters977e5402001-10-17 03:57:20 +0000856 {"flush", (binaryfunc)PyZlib_flush, METH_VARARGS,
Jeremy Hylton9714f992001-10-16 21:19:45 +0000857 comp_flush__doc__},
Thomas Wouters0e3f5912006-08-11 14:57:12 +0000858#ifdef HAVE_ZLIB_COPY
Thomas Wouters477c8d52006-05-27 19:21:47 +0000859 {"copy", (PyCFunction)PyZlib_copy, METH_NOARGS,
860 comp_copy__doc__},
Thomas Wouters0e3f5912006-08-11 14:57:12 +0000861#endif
Jeremy Hylton9714f992001-10-16 21:19:45 +0000862 {NULL, NULL}
Guido van Rossumfb221561997-04-29 15:38:09 +0000863};
864
865static PyMethodDef Decomp_methods[] =
866{
Tim Peters977e5402001-10-17 03:57:20 +0000867 {"decompress", (binaryfunc)PyZlib_objdecompress, METH_VARARGS,
Jeremy Hylton9714f992001-10-16 21:19:45 +0000868 decomp_decompress__doc__},
Tim Peters977e5402001-10-17 03:57:20 +0000869 {"flush", (binaryfunc)PyZlib_unflush, METH_VARARGS,
Jeremy Hylton9714f992001-10-16 21:19:45 +0000870 decomp_flush__doc__},
Thomas Wouters0e3f5912006-08-11 14:57:12 +0000871#ifdef HAVE_ZLIB_COPY
Thomas Wouters477c8d52006-05-27 19:21:47 +0000872 {"copy", (PyCFunction)PyZlib_uncopy, METH_NOARGS,
873 decomp_copy__doc__},
Thomas Wouters0e3f5912006-08-11 14:57:12 +0000874#endif
Jeremy Hylton9714f992001-10-16 21:19:45 +0000875 {NULL, NULL}
Guido van Rossumfb221561997-04-29 15:38:09 +0000876};
877
878static PyObject *
Peter Schneider-Kampa788a7f2000-07-10 09:57:19 +0000879Comp_getattr(compobject *self, char *name)
Guido van Rossumfb221561997-04-29 15:38:09 +0000880{
Martin v. Löwis3bd8c1e2001-09-07 16:27:31 +0000881 /* No ENTER/LEAVE_ZLIB is necessary because this fn doesn't touch
882 internal data. */
883
884 return Py_FindMethod(comp_methods, (PyObject *)self, name);
Guido van Rossumfb221561997-04-29 15:38:09 +0000885}
886
887static PyObject *
Peter Schneider-Kampa788a7f2000-07-10 09:57:19 +0000888Decomp_getattr(compobject *self, char *name)
Guido van Rossumfb221561997-04-29 15:38:09 +0000889{
Jeremy Hylton9714f992001-10-16 21:19:45 +0000890 PyObject * retval;
Martin v. Löwis3bd8c1e2001-09-07 16:27:31 +0000891
Jeremy Hylton9714f992001-10-16 21:19:45 +0000892 ENTER_ZLIB
Martin v. Löwis3bd8c1e2001-09-07 16:27:31 +0000893
Tim Peters977e5402001-10-17 03:57:20 +0000894 if (strcmp(name, "unused_data") == 0) {
Jeremy Hylton9714f992001-10-16 21:19:45 +0000895 Py_INCREF(self->unused_data);
896 retval = self->unused_data;
Tim Peters977e5402001-10-17 03:57:20 +0000897 } else if (strcmp(name, "unconsumed_tail") == 0) {
Jeremy Hylton9714f992001-10-16 21:19:45 +0000898 Py_INCREF(self->unconsumed_tail);
899 retval = self->unconsumed_tail;
Tim Peters977e5402001-10-17 03:57:20 +0000900 } else
Jeremy Hylton9714f992001-10-16 21:19:45 +0000901 retval = Py_FindMethod(Decomp_methods, (PyObject *)self, name);
Martin v. Löwis3bd8c1e2001-09-07 16:27:31 +0000902
Jeremy Hylton9714f992001-10-16 21:19:45 +0000903 LEAVE_ZLIB
Martin v. Löwis3bd8c1e2001-09-07 16:27:31 +0000904
Jeremy Hylton9714f992001-10-16 21:19:45 +0000905 return retval;
Guido van Rossumfb221561997-04-29 15:38:09 +0000906}
907
Martin v. Löwis14f8b4c2002-06-13 20:33:02 +0000908PyDoc_STRVAR(adler32__doc__,
Tim Petersadbd35b2001-10-17 04:16:15 +0000909"adler32(string[, start]) -- Compute an Adler-32 checksum of string.\n"
910"\n"
911"An optional starting value can be specified. The returned checksum is\n"
Martin v. Löwis14f8b4c2002-06-13 20:33:02 +0000912"an integer.");
Guido van Rossum3c540301997-06-03 22:21:03 +0000913
Guido van Rossumfb221561997-04-29 15:38:09 +0000914static PyObject *
Peter Schneider-Kampa788a7f2000-07-10 09:57:19 +0000915PyZlib_adler32(PyObject *self, PyObject *args)
Guido van Rossumfb221561997-04-29 15:38:09 +0000916{
Jeremy Hylton9714f992001-10-16 21:19:45 +0000917 uLong adler32val = adler32(0L, Z_NULL, 0);
Jeremy Hyltoncb914041997-09-04 23:39:23 +0000918 Byte *buf;
919 int len;
Tim Peters977e5402001-10-17 03:57:20 +0000920
Andrew M. Kuchlingbb7e8002005-11-22 15:32:28 +0000921 if (!PyArg_ParseTuple(args, "s#|k:adler32", &buf, &len, &adler32val))
Jeremy Hyltoncb914041997-09-04 23:39:23 +0000922 return NULL;
Jeremy Hyltoncb914041997-09-04 23:39:23 +0000923 adler32val = adler32(adler32val, buf, len);
924 return PyInt_FromLong(adler32val);
Guido van Rossumfb221561997-04-29 15:38:09 +0000925}
Tim Peters977e5402001-10-17 03:57:20 +0000926
Martin v. Löwis14f8b4c2002-06-13 20:33:02 +0000927PyDoc_STRVAR(crc32__doc__,
Tim Petersadbd35b2001-10-17 04:16:15 +0000928"crc32(string[, start]) -- Compute a CRC-32 checksum of string.\n"
929"\n"
930"An optional starting value can be specified. The returned checksum is\n"
Martin v. Löwis14f8b4c2002-06-13 20:33:02 +0000931"an integer.");
Guido van Rossumfb221561997-04-29 15:38:09 +0000932
933static PyObject *
Peter Schneider-Kampa788a7f2000-07-10 09:57:19 +0000934PyZlib_crc32(PyObject *self, PyObject *args)
Guido van Rossumfb221561997-04-29 15:38:09 +0000935{
Jeremy Hylton9714f992001-10-16 21:19:45 +0000936 uLong crc32val = crc32(0L, Z_NULL, 0);
Jeremy Hyltoncb914041997-09-04 23:39:23 +0000937 Byte *buf;
938 int len;
Andrew M. Kuchlingbb7e8002005-11-22 15:32:28 +0000939 if (!PyArg_ParseTuple(args, "s#|k:crc32", &buf, &len, &crc32val))
Jeremy Hyltoncb914041997-09-04 23:39:23 +0000940 return NULL;
Jeremy Hyltoncb914041997-09-04 23:39:23 +0000941 crc32val = crc32(crc32val, buf, len);
942 return PyInt_FromLong(crc32val);
Guido van Rossumfb221561997-04-29 15:38:09 +0000943}
Tim Peters977e5402001-10-17 03:57:20 +0000944
Guido van Rossumfb221561997-04-29 15:38:09 +0000945
946static PyMethodDef zlib_methods[] =
947{
Tim Peters977e5402001-10-17 03:57:20 +0000948 {"adler32", (PyCFunction)PyZlib_adler32, METH_VARARGS,
Jeremy Hylton9714f992001-10-16 21:19:45 +0000949 adler32__doc__},
Tim Peters977e5402001-10-17 03:57:20 +0000950 {"compress", (PyCFunction)PyZlib_compress, METH_VARARGS,
Jeremy Hylton9714f992001-10-16 21:19:45 +0000951 compress__doc__},
Tim Peters977e5402001-10-17 03:57:20 +0000952 {"compressobj", (PyCFunction)PyZlib_compressobj, METH_VARARGS,
Jeremy Hylton9714f992001-10-16 21:19:45 +0000953 compressobj__doc__},
Tim Peters977e5402001-10-17 03:57:20 +0000954 {"crc32", (PyCFunction)PyZlib_crc32, METH_VARARGS,
955 crc32__doc__},
956 {"decompress", (PyCFunction)PyZlib_decompress, METH_VARARGS,
Jeremy Hylton9714f992001-10-16 21:19:45 +0000957 decompress__doc__},
Tim Peters977e5402001-10-17 03:57:20 +0000958 {"decompressobj", (PyCFunction)PyZlib_decompressobj, METH_VARARGS,
Jeremy Hylton9714f992001-10-16 21:19:45 +0000959 decompressobj__doc__},
960 {NULL, NULL}
Guido van Rossumfb221561997-04-29 15:38:09 +0000961};
962
Tim Peters0c322792002-07-17 16:49:03 +0000963static PyTypeObject Comptype = {
Martin v. Löwis9f2e3462007-07-21 17:22:18 +0000964 PyVarObject_HEAD_INIT(0, 0)
Guido van Rossum14648392001-12-08 18:02:58 +0000965 "zlib.Compress",
Jeremy Hylton9714f992001-10-16 21:19:45 +0000966 sizeof(compobject),
967 0,
968 (destructor)Comp_dealloc, /*tp_dealloc*/
969 0, /*tp_print*/
970 (getattrfunc)Comp_getattr, /*tp_getattr*/
971 0, /*tp_setattr*/
972 0, /*tp_compare*/
973 0, /*tp_repr*/
974 0, /*tp_as_number*/
975 0, /*tp_as_sequence*/
976 0, /*tp_as_mapping*/
Guido van Rossumfb221561997-04-29 15:38:09 +0000977};
978
Tim Peters0c322792002-07-17 16:49:03 +0000979static PyTypeObject Decomptype = {
Martin v. Löwis9f2e3462007-07-21 17:22:18 +0000980 PyVarObject_HEAD_INIT(0, 0)
Guido van Rossum14648392001-12-08 18:02:58 +0000981 "zlib.Decompress",
Jeremy Hylton9714f992001-10-16 21:19:45 +0000982 sizeof(compobject),
983 0,
984 (destructor)Decomp_dealloc, /*tp_dealloc*/
985 0, /*tp_print*/
986 (getattrfunc)Decomp_getattr, /*tp_getattr*/
987 0, /*tp_setattr*/
988 0, /*tp_compare*/
989 0, /*tp_repr*/
990 0, /*tp_as_number*/
991 0, /*tp_as_sequence*/
992 0, /*tp_as_mapping*/
Guido van Rossumfb221561997-04-29 15:38:09 +0000993};
994
Martin v. Löwis14f8b4c2002-06-13 20:33:02 +0000995PyDoc_STRVAR(zlib_module_documentation,
Tim Petersadbd35b2001-10-17 04:16:15 +0000996"The functions in this module allow compression and decompression using the\n"
997"zlib library, which is based on GNU zip.\n"
998"\n"
999"adler32(string[, start]) -- Compute an Adler-32 checksum.\n"
1000"compress(string[, level]) -- Compress string, with compression level in 1-9.\n"
Guido van Rossum3c540301997-06-03 22:21:03 +00001001"compressobj([level]) -- Return a compressor object.\n"
Tim Petersadbd35b2001-10-17 04:16:15 +00001002"crc32(string[, start]) -- Compute a CRC-32 checksum.\n"
Andrew M. Kuchling313a3e31999-12-20 22:13:38 +00001003"decompress(string,[wbits],[bufsize]) -- Decompresses a compressed string.\n"
Tim Petersadbd35b2001-10-17 04:16:15 +00001004"decompressobj([wbits]) -- Return a decompressor object.\n"
1005"\n"
1006"'wbits' is window buffer size.\n"
1007"Compressor objects support compress() and flush() methods; decompressor\n"
Martin v. Löwis14f8b4c2002-06-13 20:33:02 +00001008"objects support decompress() and flush().");
Guido van Rossum3c540301997-06-03 22:21:03 +00001009
Mark Hammond62b1ab12002-07-23 06:31:15 +00001010PyMODINIT_FUNC
Thomas Woutersf3f33dc2000-07-21 06:00:07 +00001011PyInit_zlib(void)
Guido van Rossumfb221561997-04-29 15:38:09 +00001012{
Fred Drake4baedc12002-04-01 14:53:37 +00001013 PyObject *m, *ver;
Martin v. Löwis9f2e3462007-07-21 17:22:18 +00001014 Py_Type(&Comptype) = &PyType_Type;
1015 Py_Type(&Decomptype) = &PyType_Type;
Jeremy Hylton9714f992001-10-16 21:19:45 +00001016 m = Py_InitModule4("zlib", zlib_methods,
1017 zlib_module_documentation,
1018 (PyObject*)NULL,PYTHON_API_VERSION);
Neal Norwitz1ac754f2006-01-19 06:09:39 +00001019 if (m == NULL)
1020 return;
Jeremy Hyltoncb914041997-09-04 23:39:23 +00001021
Fred Drake4baedc12002-04-01 14:53:37 +00001022 ZlibError = PyErr_NewException("zlib.error", NULL, NULL);
1023 if (ZlibError != NULL) {
1024 Py_INCREF(ZlibError);
1025 PyModule_AddObject(m, "error", ZlibError);
1026 }
Jeremy Hylton9714f992001-10-16 21:19:45 +00001027 PyModule_AddIntConstant(m, "MAX_WBITS", MAX_WBITS);
1028 PyModule_AddIntConstant(m, "DEFLATED", DEFLATED);
1029 PyModule_AddIntConstant(m, "DEF_MEM_LEVEL", DEF_MEM_LEVEL);
1030 PyModule_AddIntConstant(m, "Z_BEST_SPEED", Z_BEST_SPEED);
1031 PyModule_AddIntConstant(m, "Z_BEST_COMPRESSION", Z_BEST_COMPRESSION);
1032 PyModule_AddIntConstant(m, "Z_DEFAULT_COMPRESSION", Z_DEFAULT_COMPRESSION);
1033 PyModule_AddIntConstant(m, "Z_FILTERED", Z_FILTERED);
1034 PyModule_AddIntConstant(m, "Z_HUFFMAN_ONLY", Z_HUFFMAN_ONLY);
1035 PyModule_AddIntConstant(m, "Z_DEFAULT_STRATEGY", Z_DEFAULT_STRATEGY);
Tim Peters977e5402001-10-17 03:57:20 +00001036
Jeremy Hylton9714f992001-10-16 21:19:45 +00001037 PyModule_AddIntConstant(m, "Z_FINISH", Z_FINISH);
1038 PyModule_AddIntConstant(m, "Z_NO_FLUSH", Z_NO_FLUSH);
1039 PyModule_AddIntConstant(m, "Z_SYNC_FLUSH", Z_SYNC_FLUSH);
1040 PyModule_AddIntConstant(m, "Z_FULL_FLUSH", Z_FULL_FLUSH);
Tim Peters977e5402001-10-17 03:57:20 +00001041
Neal Norwitz53cbdaa2007-08-23 21:42:55 +00001042 ver = PyUnicode_FromString(ZLIB_VERSION);
Fred Drake4baedc12002-04-01 14:53:37 +00001043 if (ver != NULL)
1044 PyModule_AddObject(m, "ZLIB_VERSION", ver);
Martin v. Löwis3bd8c1e2001-09-07 16:27:31 +00001045
Guido van Rossum7d9ea502003-02-03 20:45:52 +00001046 PyModule_AddStringConstant(m, "__version__", "1.0");
1047
Martin v. Löwis3bd8c1e2001-09-07 16:27:31 +00001048#ifdef WITH_THREAD
Jeremy Hylton9714f992001-10-16 21:19:45 +00001049 zlib_lock = PyThread_allocate_lock();
Sjoerd Mullender556a9382002-03-11 09:20:47 +00001050#endif /* WITH_THREAD */
Guido van Rossumfb221561997-04-29 15:38:09 +00001051}