Guido van Rossum | fb22156 | 1997-04-29 15:38:09 +0000 | [diff] [blame] | 1 | /* zlibmodule.c -- gzip-compatible data compression */ |
Mark Hammond | ae8c268 | 2001-01-31 10:28:03 +0000 | [diff] [blame] | 2 | /* See http://www.info-zip.org/pub/infozip/zlib/ */ |
| 3 | |
Tim Peters | ee826f8 | 2001-01-31 19:39:44 +0000 | [diff] [blame] | 4 | /* Windows users: read Python's PCbuild\readme.txt */ |
Mark Hammond | ae8c268 | 2001-01-31 10:28:03 +0000 | [diff] [blame] | 5 | |
Guido van Rossum | fb22156 | 1997-04-29 15:38:09 +0000 | [diff] [blame] | 6 | |
Guido van Rossum | 97b5457 | 1997-06-03 22:21:47 +0000 | [diff] [blame] | 7 | #include "Python.h" |
| 8 | #include "zlib.h" |
Guido van Rossum | fb22156 | 1997-04-29 15:38:09 +0000 | [diff] [blame] | 9 | |
| 10 | /* The following parameters are copied from zutil.h, version 0.95 */ |
| 11 | #define DEFLATED 8 |
| 12 | #if MAX_MEM_LEVEL >= 8 |
| 13 | # define DEF_MEM_LEVEL 8 |
| 14 | #else |
| 15 | # define DEF_MEM_LEVEL MAX_MEM_LEVEL |
| 16 | #endif |
| 17 | #define DEF_WBITS MAX_WBITS |
| 18 | |
Guido van Rossum | b729a1d | 1999-04-07 20:23:17 +0000 | [diff] [blame] | 19 | /* The output buffer will be increased in chunks of DEFAULTALLOC bytes. */ |
| 20 | #define DEFAULTALLOC (16*1024) |
Guido van Rossum | fb22156 | 1997-04-29 15:38:09 +0000 | [diff] [blame] | 21 | #define PyInit_zlib initzlib |
| 22 | |
| 23 | staticforward PyTypeObject Comptype; |
| 24 | staticforward PyTypeObject Decomptype; |
| 25 | |
| 26 | static PyObject *ZlibError; |
| 27 | |
| 28 | typedef struct |
| 29 | { |
| 30 | PyObject_HEAD |
| 31 | z_stream zst; |
Andrew M. Kuchling | b95227d | 1999-03-25 21:21:08 +0000 | [diff] [blame] | 32 | PyObject *unused_data; |
Andrew M. Kuchling | 1c7aaa2 | 1999-01-29 21:49:34 +0000 | [diff] [blame] | 33 | int is_initialised; |
Guido van Rossum | fb22156 | 1997-04-29 15:38:09 +0000 | [diff] [blame] | 34 | } compobject; |
| 35 | |
Guido van Rossum | 3c54030 | 1997-06-03 22:21:03 +0000 | [diff] [blame] | 36 | static char compressobj__doc__[] = |
| 37 | "compressobj() -- Return a compressor object.\n" |
| 38 | "compressobj(level) -- Return a compressor object, using the given compression level.\n" |
| 39 | ; |
| 40 | |
| 41 | static char decompressobj__doc__[] = |
| 42 | "decompressobj() -- Return a decompressor object.\n" |
| 43 | "decompressobj(wbits) -- Return a decompressor object, setting the window buffer size to wbits.\n" |
| 44 | ; |
| 45 | |
Guido van Rossum | fb22156 | 1997-04-29 15:38:09 +0000 | [diff] [blame] | 46 | static compobject * |
Peter Schneider-Kamp | a788a7f | 2000-07-10 09:57:19 +0000 | [diff] [blame] | 47 | newcompobject(PyTypeObject *type) |
Guido van Rossum | fb22156 | 1997-04-29 15:38:09 +0000 | [diff] [blame] | 48 | { |
| 49 | compobject *self; |
Guido van Rossum | b18618d | 2000-05-03 23:44:39 +0000 | [diff] [blame] | 50 | self = PyObject_New(compobject, type); |
Guido van Rossum | fb22156 | 1997-04-29 15:38:09 +0000 | [diff] [blame] | 51 | if (self == NULL) |
| 52 | return NULL; |
Andrew M. Kuchling | 1c7aaa2 | 1999-01-29 21:49:34 +0000 | [diff] [blame] | 53 | self->is_initialised = 0; |
Andrew M. Kuchling | b95227d | 1999-03-25 21:21:08 +0000 | [diff] [blame] | 54 | self->unused_data = PyString_FromString(""); |
Guido van Rossum | fb22156 | 1997-04-29 15:38:09 +0000 | [diff] [blame] | 55 | return self; |
| 56 | } |
| 57 | |
Guido van Rossum | 3c54030 | 1997-06-03 22:21:03 +0000 | [diff] [blame] | 58 | static char compress__doc__[] = |
| 59 | "compress(string) -- Compress string using the default compression level, " |
| 60 | "returning a string containing compressed data.\n" |
| 61 | "compress(string, level) -- Compress string, using the chosen compression " |
| 62 | "level (from 1 to 9). Return a string containing the compressed data.\n" |
| 63 | ; |
| 64 | |
Guido van Rossum | fb22156 | 1997-04-29 15:38:09 +0000 | [diff] [blame] | 65 | static PyObject * |
Peter Schneider-Kamp | a788a7f | 2000-07-10 09:57:19 +0000 | [diff] [blame] | 66 | PyZlib_compress(PyObject *self, PyObject *args) |
Guido van Rossum | fb22156 | 1997-04-29 15:38:09 +0000 | [diff] [blame] | 67 | { |
| 68 | PyObject *ReturnVal; |
| 69 | Byte *input, *output; |
| 70 | int length, level=Z_DEFAULT_COMPRESSION, err; |
| 71 | z_stream zst; |
| 72 | |
Guido van Rossum | 43713e5 | 2000-02-29 13:59:29 +0000 | [diff] [blame] | 73 | if (!PyArg_ParseTuple(args, "s#|i:compress", &input, &length, &level)) |
Guido van Rossum | fb22156 | 1997-04-29 15:38:09 +0000 | [diff] [blame] | 74 | return NULL; |
Jeremy Hylton | cb91404 | 1997-09-04 23:39:23 +0000 | [diff] [blame] | 75 | zst.avail_out = length + length/1000 + 12 + 1; |
Guido van Rossum | fb22156 | 1997-04-29 15:38:09 +0000 | [diff] [blame] | 76 | output=(Byte*)malloc(zst.avail_out); |
| 77 | if (output==NULL) |
| 78 | { |
| 79 | PyErr_SetString(PyExc_MemoryError, |
| 80 | "Can't allocate memory to compress data"); |
| 81 | return NULL; |
| 82 | } |
Jeremy Hylton | a37e244 | 1998-12-18 22:13:11 +0000 | [diff] [blame] | 83 | |
Jeremy Hylton | 5bc4abe | 1998-12-21 17:15:00 +0000 | [diff] [blame] | 84 | zst.zalloc=(alloc_func)NULL; |
Guido van Rossum | 97b5457 | 1997-06-03 22:21:47 +0000 | [diff] [blame] | 85 | zst.zfree=(free_func)Z_NULL; |
Guido van Rossum | fb22156 | 1997-04-29 15:38:09 +0000 | [diff] [blame] | 86 | zst.next_out=(Byte *)output; |
| 87 | zst.next_in =(Byte *)input; |
| 88 | zst.avail_in=length; |
| 89 | err=deflateInit(&zst, level); |
| 90 | switch(err) |
| 91 | { |
| 92 | case(Z_OK): |
| 93 | break; |
| 94 | case(Z_MEM_ERROR): |
| 95 | PyErr_SetString(PyExc_MemoryError, |
| 96 | "Out of memory while compressing data"); |
| 97 | free(output); |
| 98 | return NULL; |
Guido van Rossum | fb22156 | 1997-04-29 15:38:09 +0000 | [diff] [blame] | 99 | case(Z_STREAM_ERROR): |
| 100 | PyErr_SetString(ZlibError, |
| 101 | "Bad compression level"); |
| 102 | free(output); |
| 103 | return NULL; |
Guido van Rossum | fb22156 | 1997-04-29 15:38:09 +0000 | [diff] [blame] | 104 | default: |
| 105 | { |
Jeremy Hylton | cb91404 | 1997-09-04 23:39:23 +0000 | [diff] [blame] | 106 | if (zst.msg == Z_NULL) |
| 107 | PyErr_Format(ZlibError, "Error %i while compressing data", |
| 108 | err); |
| 109 | else |
| 110 | PyErr_Format(ZlibError, "Error %i while compressing data: %.200s", |
| 111 | err, zst.msg); |
Guido van Rossum | fb22156 | 1997-04-29 15:38:09 +0000 | [diff] [blame] | 112 | deflateEnd(&zst); |
| 113 | free(output); |
| 114 | return NULL; |
| 115 | } |
Guido van Rossum | fb22156 | 1997-04-29 15:38:09 +0000 | [diff] [blame] | 116 | } |
| 117 | |
| 118 | err=deflate(&zst, Z_FINISH); |
| 119 | switch(err) |
Jeremy Hylton | cb91404 | 1997-09-04 23:39:23 +0000 | [diff] [blame] | 120 | { |
Guido van Rossum | fb22156 | 1997-04-29 15:38:09 +0000 | [diff] [blame] | 121 | case(Z_STREAM_END): |
| 122 | break; |
| 123 | /* Are there other errors to be trapped here? */ |
| 124 | default: |
Jeremy Hylton | cb91404 | 1997-09-04 23:39:23 +0000 | [diff] [blame] | 125 | { |
| 126 | if (zst.msg == Z_NULL) |
| 127 | PyErr_Format(ZlibError, "Error %i while compressing data", |
| 128 | err); |
| 129 | else |
| 130 | PyErr_Format(ZlibError, "Error %i while compressing data: %.200s", |
| 131 | err, zst.msg); |
| 132 | deflateEnd(&zst); |
| 133 | free(output); |
| 134 | return NULL; |
| 135 | } |
| 136 | } |
Guido van Rossum | fb22156 | 1997-04-29 15:38:09 +0000 | [diff] [blame] | 137 | err=deflateEnd(&zst); |
| 138 | if (err!=Z_OK) |
Jeremy Hylton | cb91404 | 1997-09-04 23:39:23 +0000 | [diff] [blame] | 139 | { |
| 140 | if (zst.msg == Z_NULL) |
| 141 | PyErr_Format(ZlibError, "Error %i while finishing compression", |
| 142 | err); |
| 143 | else |
| 144 | PyErr_Format(ZlibError, |
| 145 | "Error %i while finishing compression: %.200s", |
| 146 | err, zst.msg); |
Guido van Rossum | fb22156 | 1997-04-29 15:38:09 +0000 | [diff] [blame] | 147 | free(output); |
| 148 | return NULL; |
| 149 | } |
Guido van Rossum | 97b5457 | 1997-06-03 22:21:47 +0000 | [diff] [blame] | 150 | ReturnVal=PyString_FromStringAndSize((char *)output, zst.total_out); |
Guido van Rossum | fb22156 | 1997-04-29 15:38:09 +0000 | [diff] [blame] | 151 | free(output); |
| 152 | return ReturnVal; |
| 153 | } |
| 154 | |
Guido van Rossum | 3c54030 | 1997-06-03 22:21:03 +0000 | [diff] [blame] | 155 | static char decompress__doc__[] = |
Jeremy Hylton | 41b9f00 | 1997-08-13 23:19:55 +0000 | [diff] [blame] | 156 | "decompress(string) -- Decompress the data in string, returning a string containing the decompressed data.\n" |
| 157 | "decompress(string, wbits) -- Decompress the data in string with a window buffer size of wbits.\n" |
| 158 | "decompress(string, wbits, bufsize) -- Decompress the data in string with a window buffer size of wbits and an initial output buffer size of bufsize.\n" |
Guido van Rossum | 3c54030 | 1997-06-03 22:21:03 +0000 | [diff] [blame] | 159 | ; |
| 160 | |
Guido van Rossum | fb22156 | 1997-04-29 15:38:09 +0000 | [diff] [blame] | 161 | static PyObject * |
Peter Schneider-Kamp | a788a7f | 2000-07-10 09:57:19 +0000 | [diff] [blame] | 162 | PyZlib_decompress(PyObject *self, PyObject *args) |
Guido van Rossum | fb22156 | 1997-04-29 15:38:09 +0000 | [diff] [blame] | 163 | { |
Jeremy Hylton | 41b9f00 | 1997-08-13 23:19:55 +0000 | [diff] [blame] | 164 | PyObject *result_str; |
| 165 | Byte *input; |
Guido van Rossum | fb22156 | 1997-04-29 15:38:09 +0000 | [diff] [blame] | 166 | int length, err; |
Jeremy Hylton | 41b9f00 | 1997-08-13 23:19:55 +0000 | [diff] [blame] | 167 | int wsize=DEF_WBITS, r_strlen=DEFAULTALLOC; |
Guido van Rossum | fb22156 | 1997-04-29 15:38:09 +0000 | [diff] [blame] | 168 | z_stream zst; |
Guido van Rossum | 43713e5 | 2000-02-29 13:59:29 +0000 | [diff] [blame] | 169 | if (!PyArg_ParseTuple(args, "s#|ii:decompress", &input, &length, &wsize, &r_strlen)) |
Guido van Rossum | fb22156 | 1997-04-29 15:38:09 +0000 | [diff] [blame] | 170 | return NULL; |
Jeremy Hylton | cb91404 | 1997-09-04 23:39:23 +0000 | [diff] [blame] | 171 | |
| 172 | if (r_strlen <= 0) |
| 173 | r_strlen = 1; |
Jeremy Hylton | a37e244 | 1998-12-18 22:13:11 +0000 | [diff] [blame] | 174 | |
Guido van Rossum | fb22156 | 1997-04-29 15:38:09 +0000 | [diff] [blame] | 175 | zst.avail_in=length; |
Jeremy Hylton | 41b9f00 | 1997-08-13 23:19:55 +0000 | [diff] [blame] | 176 | zst.avail_out=r_strlen; |
| 177 | if (!(result_str = PyString_FromStringAndSize(NULL, r_strlen))) |
| 178 | { |
Guido van Rossum | fb22156 | 1997-04-29 15:38:09 +0000 | [diff] [blame] | 179 | PyErr_SetString(PyExc_MemoryError, |
| 180 | "Can't allocate memory to decompress data"); |
| 181 | return NULL; |
Jeremy Hylton | 41b9f00 | 1997-08-13 23:19:55 +0000 | [diff] [blame] | 182 | } |
Guido van Rossum | 97b5457 | 1997-06-03 22:21:47 +0000 | [diff] [blame] | 183 | zst.zalloc=(alloc_func)NULL; |
| 184 | zst.zfree=(free_func)Z_NULL; |
Jeremy Hylton | 41b9f00 | 1997-08-13 23:19:55 +0000 | [diff] [blame] | 185 | zst.next_out=(Byte *)PyString_AsString(result_str); |
Guido van Rossum | fb22156 | 1997-04-29 15:38:09 +0000 | [diff] [blame] | 186 | zst.next_in =(Byte *)input; |
Jeremy Hylton | 41b9f00 | 1997-08-13 23:19:55 +0000 | [diff] [blame] | 187 | err=inflateInit2(&zst, wsize); |
Guido van Rossum | fb22156 | 1997-04-29 15:38:09 +0000 | [diff] [blame] | 188 | switch(err) |
| 189 | { |
| 190 | case(Z_OK): |
| 191 | break; |
| 192 | case(Z_MEM_ERROR): |
| 193 | PyErr_SetString(PyExc_MemoryError, |
| 194 | "Out of memory while decompressing data"); |
Jeremy Hylton | cb91404 | 1997-09-04 23:39:23 +0000 | [diff] [blame] | 195 | Py_DECREF(result_str); |
Guido van Rossum | fb22156 | 1997-04-29 15:38:09 +0000 | [diff] [blame] | 196 | return NULL; |
| 197 | default: |
| 198 | { |
Jeremy Hylton | cb91404 | 1997-09-04 23:39:23 +0000 | [diff] [blame] | 199 | if (zst.msg == Z_NULL) |
| 200 | PyErr_Format(ZlibError, "Error %i preparing to decompress data", |
| 201 | err); |
| 202 | else |
| 203 | PyErr_Format(ZlibError, |
| 204 | "Error %i while preparing to decompress data: %.200s", |
| 205 | err, zst.msg); |
Guido van Rossum | fb22156 | 1997-04-29 15:38:09 +0000 | [diff] [blame] | 206 | inflateEnd(&zst); |
Jeremy Hylton | cb91404 | 1997-09-04 23:39:23 +0000 | [diff] [blame] | 207 | Py_DECREF(result_str); |
Guido van Rossum | fb22156 | 1997-04-29 15:38:09 +0000 | [diff] [blame] | 208 | return NULL; |
| 209 | } |
| 210 | } |
| 211 | do |
| 212 | { |
| 213 | err=inflate(&zst, Z_FINISH); |
| 214 | switch(err) |
| 215 | { |
Guido van Rossum | fb22156 | 1997-04-29 15:38:09 +0000 | [diff] [blame] | 216 | case(Z_STREAM_END): |
Jeremy Hylton | 41b9f00 | 1997-08-13 23:19:55 +0000 | [diff] [blame] | 217 | break; |
Guido van Rossum | 115f517 | 1998-04-23 20:22:11 +0000 | [diff] [blame] | 218 | case(Z_BUF_ERROR): |
Andrew M. Kuchling | d923831 | 2000-10-09 14:18:10 +0000 | [diff] [blame] | 219 | /* |
| 220 | * If there is at least 1 byte of room according to zst.avail_out |
| 221 | * and we get this error, assume that it means zlib cannot |
| 222 | * process the inflate call() due to an error in the data. |
| 223 | */ |
| 224 | if (zst.avail_out > 0) |
| 225 | { |
| 226 | PyErr_Format(ZlibError, "Error %i while decompressing data", |
| 227 | err); |
| 228 | inflateEnd(&zst); |
| 229 | Py_DECREF(result_str); |
| 230 | return NULL; |
| 231 | } |
| 232 | /* fall through */ |
| 233 | case(Z_OK): |
Jeremy Hylton | 41b9f00 | 1997-08-13 23:19:55 +0000 | [diff] [blame] | 234 | /* need more memory */ |
| 235 | if (_PyString_Resize(&result_str, r_strlen << 1) == -1) |
Guido van Rossum | fb22156 | 1997-04-29 15:38:09 +0000 | [diff] [blame] | 236 | { |
| 237 | PyErr_SetString(PyExc_MemoryError, |
| 238 | "Out of memory while decompressing data"); |
| 239 | inflateEnd(&zst); |
| 240 | return NULL; |
| 241 | } |
Guido van Rossum | ed2554a | 1997-08-18 15:31:24 +0000 | [diff] [blame] | 242 | zst.next_out = (unsigned char *)PyString_AsString(result_str) + r_strlen; |
Jeremy Hylton | 41b9f00 | 1997-08-13 23:19:55 +0000 | [diff] [blame] | 243 | zst.avail_out=r_strlen; |
| 244 | r_strlen = r_strlen << 1; |
| 245 | break; |
Guido van Rossum | fb22156 | 1997-04-29 15:38:09 +0000 | [diff] [blame] | 246 | default: |
| 247 | { |
Jeremy Hylton | cb91404 | 1997-09-04 23:39:23 +0000 | [diff] [blame] | 248 | if (zst.msg == Z_NULL) |
| 249 | PyErr_Format(ZlibError, "Error %i while decompressing data", |
| 250 | err); |
| 251 | else |
| 252 | PyErr_Format(ZlibError, |
| 253 | "Error %i while decompressing data: %.200s", |
| 254 | err, zst.msg); |
Guido van Rossum | fb22156 | 1997-04-29 15:38:09 +0000 | [diff] [blame] | 255 | inflateEnd(&zst); |
Jeremy Hylton | cb91404 | 1997-09-04 23:39:23 +0000 | [diff] [blame] | 256 | Py_DECREF(result_str); |
Guido van Rossum | fb22156 | 1997-04-29 15:38:09 +0000 | [diff] [blame] | 257 | return NULL; |
| 258 | } |
| 259 | } |
| 260 | } while(err!=Z_STREAM_END); |
| 261 | |
| 262 | err=inflateEnd(&zst); |
| 263 | if (err!=Z_OK) |
Jeremy Hylton | cb91404 | 1997-09-04 23:39:23 +0000 | [diff] [blame] | 264 | { |
| 265 | if (zst.msg == Z_NULL) |
| 266 | PyErr_Format(ZlibError, |
| 267 | "Error %i while finishing data decompression", |
| 268 | err); |
| 269 | else |
| 270 | PyErr_Format(ZlibError, |
| 271 | "Error %i while finishing data decompression: %.200s", |
| 272 | err, zst.msg); |
| 273 | Py_DECREF(result_str); |
Guido van Rossum | fb22156 | 1997-04-29 15:38:09 +0000 | [diff] [blame] | 274 | return NULL; |
| 275 | } |
Jeremy Hylton | 41b9f00 | 1997-08-13 23:19:55 +0000 | [diff] [blame] | 276 | _PyString_Resize(&result_str, zst.total_out); |
| 277 | return result_str; |
Guido van Rossum | fb22156 | 1997-04-29 15:38:09 +0000 | [diff] [blame] | 278 | } |
| 279 | |
| 280 | static PyObject * |
Peter Schneider-Kamp | a788a7f | 2000-07-10 09:57:19 +0000 | [diff] [blame] | 281 | PyZlib_compressobj(PyObject *selfptr, PyObject *args) |
Guido van Rossum | fb22156 | 1997-04-29 15:38:09 +0000 | [diff] [blame] | 282 | { |
| 283 | compobject *self; |
| 284 | int level=Z_DEFAULT_COMPRESSION, method=DEFLATED; |
| 285 | int wbits=MAX_WBITS, memLevel=DEF_MEM_LEVEL, strategy=0, err; |
Jeremy Hylton | 41b9f00 | 1997-08-13 23:19:55 +0000 | [diff] [blame] | 286 | |
Guido van Rossum | 43713e5 | 2000-02-29 13:59:29 +0000 | [diff] [blame] | 287 | if (!PyArg_ParseTuple(args, "|iiiii:compressobj", &level, &method, &wbits, |
Jeremy Hylton | 41b9f00 | 1997-08-13 23:19:55 +0000 | [diff] [blame] | 288 | &memLevel, &strategy)) |
| 289 | return NULL; |
| 290 | |
Jeremy Hylton | cb91404 | 1997-09-04 23:39:23 +0000 | [diff] [blame] | 291 | self = newcompobject(&Comptype); |
Guido van Rossum | fb22156 | 1997-04-29 15:38:09 +0000 | [diff] [blame] | 292 | if (self==NULL) return(NULL); |
Jeremy Hylton | cb91404 | 1997-09-04 23:39:23 +0000 | [diff] [blame] | 293 | self->zst.zalloc = (alloc_func)NULL; |
| 294 | self->zst.zfree = (free_func)Z_NULL; |
| 295 | err = deflateInit2(&self->zst, level, method, wbits, memLevel, strategy); |
Guido van Rossum | fb22156 | 1997-04-29 15:38:09 +0000 | [diff] [blame] | 296 | switch(err) |
| 297 | { |
| 298 | case (Z_OK): |
Andrew M. Kuchling | 1c7aaa2 | 1999-01-29 21:49:34 +0000 | [diff] [blame] | 299 | self->is_initialised = 1; |
Guido van Rossum | fb22156 | 1997-04-29 15:38:09 +0000 | [diff] [blame] | 300 | return (PyObject*)self; |
Guido van Rossum | fb22156 | 1997-04-29 15:38:09 +0000 | [diff] [blame] | 301 | case (Z_MEM_ERROR): |
Andrew M. Kuchling | 1c7aaa2 | 1999-01-29 21:49:34 +0000 | [diff] [blame] | 302 | Py_DECREF(self); |
Guido van Rossum | fb22156 | 1997-04-29 15:38:09 +0000 | [diff] [blame] | 303 | PyErr_SetString(PyExc_MemoryError, |
| 304 | "Can't allocate memory for compression object"); |
| 305 | return NULL; |
Guido van Rossum | fb22156 | 1997-04-29 15:38:09 +0000 | [diff] [blame] | 306 | case(Z_STREAM_ERROR): |
Andrew M. Kuchling | 1c7aaa2 | 1999-01-29 21:49:34 +0000 | [diff] [blame] | 307 | Py_DECREF(self); |
Guido van Rossum | fb22156 | 1997-04-29 15:38:09 +0000 | [diff] [blame] | 308 | PyErr_SetString(PyExc_ValueError, |
Jeremy Hylton | cb91404 | 1997-09-04 23:39:23 +0000 | [diff] [blame] | 309 | "Invalid initialization option"); |
Guido van Rossum | fb22156 | 1997-04-29 15:38:09 +0000 | [diff] [blame] | 310 | return NULL; |
Guido van Rossum | fb22156 | 1997-04-29 15:38:09 +0000 | [diff] [blame] | 311 | default: |
| 312 | { |
Jeremy Hylton | cb91404 | 1997-09-04 23:39:23 +0000 | [diff] [blame] | 313 | if (self->zst.msg == Z_NULL) |
| 314 | PyErr_Format(ZlibError, |
| 315 | "Error %i while creating compression object", |
| 316 | err); |
| 317 | else |
| 318 | PyErr_Format(ZlibError, |
| 319 | "Error %i while creating compression object: %.200s", |
| 320 | err, self->zst.msg); |
Andrew M. Kuchling | 1c7aaa2 | 1999-01-29 21:49:34 +0000 | [diff] [blame] | 321 | Py_DECREF(self); |
Guido van Rossum | fb22156 | 1997-04-29 15:38:09 +0000 | [diff] [blame] | 322 | return NULL; |
Guido van Rossum | fb22156 | 1997-04-29 15:38:09 +0000 | [diff] [blame] | 323 | } |
| 324 | } |
| 325 | } |
| 326 | |
| 327 | static PyObject * |
Peter Schneider-Kamp | a788a7f | 2000-07-10 09:57:19 +0000 | [diff] [blame] | 328 | PyZlib_decompressobj(PyObject *selfptr, PyObject *args) |
Guido van Rossum | fb22156 | 1997-04-29 15:38:09 +0000 | [diff] [blame] | 329 | { |
| 330 | int wbits=DEF_WBITS, err; |
| 331 | compobject *self; |
Guido van Rossum | 43713e5 | 2000-02-29 13:59:29 +0000 | [diff] [blame] | 332 | if (!PyArg_ParseTuple(args, "|i:decompressobj", &wbits)) |
Guido van Rossum | fb22156 | 1997-04-29 15:38:09 +0000 | [diff] [blame] | 333 | { |
| 334 | return NULL; |
| 335 | } |
| 336 | self=newcompobject(&Decomptype); |
| 337 | if (self==NULL) return(NULL); |
Guido van Rossum | 97b5457 | 1997-06-03 22:21:47 +0000 | [diff] [blame] | 338 | self->zst.zalloc=(alloc_func)NULL; |
| 339 | self->zst.zfree=(free_func)Z_NULL; |
Guido van Rossum | fb22156 | 1997-04-29 15:38:09 +0000 | [diff] [blame] | 340 | err=inflateInit2(&self->zst, wbits); |
| 341 | switch(err) |
Jeremy Hylton | cb91404 | 1997-09-04 23:39:23 +0000 | [diff] [blame] | 342 | { |
Guido van Rossum | fb22156 | 1997-04-29 15:38:09 +0000 | [diff] [blame] | 343 | case (Z_OK): |
Andrew M. Kuchling | 1c7aaa2 | 1999-01-29 21:49:34 +0000 | [diff] [blame] | 344 | self->is_initialised = 1; |
Guido van Rossum | fb22156 | 1997-04-29 15:38:09 +0000 | [diff] [blame] | 345 | return (PyObject*)self; |
Jeremy Hylton | cb91404 | 1997-09-04 23:39:23 +0000 | [diff] [blame] | 346 | case(Z_STREAM_ERROR): |
Andrew M. Kuchling | 1c7aaa2 | 1999-01-29 21:49:34 +0000 | [diff] [blame] | 347 | Py_DECREF(self); |
Jeremy Hylton | cb91404 | 1997-09-04 23:39:23 +0000 | [diff] [blame] | 348 | PyErr_SetString(PyExc_ValueError, |
| 349 | "Invalid initialization option"); |
| 350 | return NULL; |
Guido van Rossum | fb22156 | 1997-04-29 15:38:09 +0000 | [diff] [blame] | 351 | case (Z_MEM_ERROR): |
Andrew M. Kuchling | 1c7aaa2 | 1999-01-29 21:49:34 +0000 | [diff] [blame] | 352 | Py_DECREF(self); |
Guido van Rossum | fb22156 | 1997-04-29 15:38:09 +0000 | [diff] [blame] | 353 | PyErr_SetString(PyExc_MemoryError, |
| 354 | "Can't allocate memory for decompression object"); |
| 355 | return NULL; |
Guido van Rossum | fb22156 | 1997-04-29 15:38:09 +0000 | [diff] [blame] | 356 | default: |
Jeremy Hylton | cb91404 | 1997-09-04 23:39:23 +0000 | [diff] [blame] | 357 | { |
| 358 | if (self->zst.msg == Z_NULL) |
| 359 | PyErr_Format(ZlibError, |
| 360 | "Error %i while creating decompression object", |
| 361 | err); |
| 362 | else |
| 363 | PyErr_Format(ZlibError, |
| 364 | "Error %i while creating decompression object: %.200s", |
| 365 | err, self->zst.msg); |
Andrew M. Kuchling | 1c7aaa2 | 1999-01-29 21:49:34 +0000 | [diff] [blame] | 366 | Py_DECREF(self); |
Guido van Rossum | fb22156 | 1997-04-29 15:38:09 +0000 | [diff] [blame] | 367 | return NULL; |
Guido van Rossum | fb22156 | 1997-04-29 15:38:09 +0000 | [diff] [blame] | 368 | } |
Jeremy Hylton | cb91404 | 1997-09-04 23:39:23 +0000 | [diff] [blame] | 369 | } |
Guido van Rossum | fb22156 | 1997-04-29 15:38:09 +0000 | [diff] [blame] | 370 | } |
| 371 | |
| 372 | static void |
Peter Schneider-Kamp | a788a7f | 2000-07-10 09:57:19 +0000 | [diff] [blame] | 373 | Comp_dealloc(compobject *self) |
Guido van Rossum | fb22156 | 1997-04-29 15:38:09 +0000 | [diff] [blame] | 374 | { |
Andrew M. Kuchling | 1c7aaa2 | 1999-01-29 21:49:34 +0000 | [diff] [blame] | 375 | if (self->is_initialised) |
| 376 | deflateEnd(&self->zst); |
Andrew M. Kuchling | b95227d | 1999-03-25 21:21:08 +0000 | [diff] [blame] | 377 | Py_XDECREF(self->unused_data); |
Guido van Rossum | b18618d | 2000-05-03 23:44:39 +0000 | [diff] [blame] | 378 | PyObject_Del(self); |
Guido van Rossum | fb22156 | 1997-04-29 15:38:09 +0000 | [diff] [blame] | 379 | } |
| 380 | |
| 381 | static void |
Peter Schneider-Kamp | a788a7f | 2000-07-10 09:57:19 +0000 | [diff] [blame] | 382 | Decomp_dealloc(compobject *self) |
Guido van Rossum | fb22156 | 1997-04-29 15:38:09 +0000 | [diff] [blame] | 383 | { |
Jeremy Hylton | cb91404 | 1997-09-04 23:39:23 +0000 | [diff] [blame] | 384 | inflateEnd(&self->zst); |
Andrew M. Kuchling | b95227d | 1999-03-25 21:21:08 +0000 | [diff] [blame] | 385 | Py_XDECREF(self->unused_data); |
Guido van Rossum | b18618d | 2000-05-03 23:44:39 +0000 | [diff] [blame] | 386 | PyObject_Del(self); |
Guido van Rossum | fb22156 | 1997-04-29 15:38:09 +0000 | [diff] [blame] | 387 | } |
| 388 | |
Guido van Rossum | 3c54030 | 1997-06-03 22:21:03 +0000 | [diff] [blame] | 389 | static char comp_compress__doc__[] = |
| 390 | "compress(data) -- Return a string containing a compressed version of the data.\n\n" |
| 391 | "After calling this function, some of the input data may still\n" |
| 392 | "be stored in internal buffers for later processing.\n" |
| 393 | "Call the flush() method to clear these buffers." |
| 394 | ; |
| 395 | |
| 396 | |
Guido van Rossum | fb22156 | 1997-04-29 15:38:09 +0000 | [diff] [blame] | 397 | static PyObject * |
Peter Schneider-Kamp | a788a7f | 2000-07-10 09:57:19 +0000 | [diff] [blame] | 398 | PyZlib_objcompress(compobject *self, PyObject *args) |
Guido van Rossum | fb22156 | 1997-04-29 15:38:09 +0000 | [diff] [blame] | 399 | { |
Jeremy Hylton | 644c17d | 1997-08-14 21:06:42 +0000 | [diff] [blame] | 400 | int err = Z_OK, inplen; |
| 401 | int length = DEFAULTALLOC; |
Guido van Rossum | fb22156 | 1997-04-29 15:38:09 +0000 | [diff] [blame] | 402 | PyObject *RetVal; |
| 403 | Byte *input; |
Jeremy Hylton | cb91404 | 1997-09-04 23:39:23 +0000 | [diff] [blame] | 404 | unsigned long start_total_out; |
Guido van Rossum | fb22156 | 1997-04-29 15:38:09 +0000 | [diff] [blame] | 405 | |
Guido van Rossum | 43713e5 | 2000-02-29 13:59:29 +0000 | [diff] [blame] | 406 | if (!PyArg_ParseTuple(args, "s#:compress", &input, &inplen)) |
Jeremy Hylton | 644c17d | 1997-08-14 21:06:42 +0000 | [diff] [blame] | 407 | return NULL; |
Jeremy Hylton | cb91404 | 1997-09-04 23:39:23 +0000 | [diff] [blame] | 408 | self->zst.avail_in = inplen; |
| 409 | self->zst.next_in = input; |
Jeremy Hylton | 644c17d | 1997-08-14 21:06:42 +0000 | [diff] [blame] | 410 | if (!(RetVal = PyString_FromStringAndSize(NULL, length))) { |
| 411 | PyErr_SetString(PyExc_MemoryError, |
| 412 | "Can't allocate memory to compress data"); |
| 413 | return NULL; |
| 414 | } |
Jeremy Hylton | cb91404 | 1997-09-04 23:39:23 +0000 | [diff] [blame] | 415 | start_total_out = self->zst.total_out; |
Guido van Rossum | ed2554a | 1997-08-18 15:31:24 +0000 | [diff] [blame] | 416 | self->zst.next_out = (unsigned char *)PyString_AsString(RetVal); |
Jeremy Hylton | 644c17d | 1997-08-14 21:06:42 +0000 | [diff] [blame] | 417 | self->zst.avail_out = length; |
| 418 | while (self->zst.avail_in != 0 && err == Z_OK) |
| 419 | { |
| 420 | err = deflate(&(self->zst), Z_NO_FLUSH); |
| 421 | if (self->zst.avail_out <= 0) { |
| 422 | if (_PyString_Resize(&RetVal, length << 1) == -1) { |
| 423 | PyErr_SetString(PyExc_MemoryError, |
| 424 | "Can't allocate memory to compress data"); |
| 425 | return NULL; |
| 426 | } |
Guido van Rossum | ed2554a | 1997-08-18 15:31:24 +0000 | [diff] [blame] | 427 | self->zst.next_out = (unsigned char *)PyString_AsString(RetVal) + length; |
Jeremy Hylton | 644c17d | 1997-08-14 21:06:42 +0000 | [diff] [blame] | 428 | self->zst.avail_out = length; |
| 429 | length = length << 1; |
| 430 | } |
| 431 | } |
| 432 | if (err != Z_OK) |
Jeremy Hylton | cb91404 | 1997-09-04 23:39:23 +0000 | [diff] [blame] | 433 | { |
| 434 | if (self->zst.msg == Z_NULL) |
| 435 | PyErr_Format(ZlibError, "Error %i while compressing", |
| 436 | err); |
| 437 | else |
| 438 | PyErr_Format(ZlibError, "Error %i while compressing: %.200s", |
| 439 | err, self->zst.msg); |
| 440 | Py_DECREF(RetVal); |
Guido van Rossum | fb22156 | 1997-04-29 15:38:09 +0000 | [diff] [blame] | 441 | return NULL; |
| 442 | } |
Jeremy Hylton | cb91404 | 1997-09-04 23:39:23 +0000 | [diff] [blame] | 443 | _PyString_Resize(&RetVal, self->zst.total_out - start_total_out); |
Guido van Rossum | fb22156 | 1997-04-29 15:38:09 +0000 | [diff] [blame] | 444 | return RetVal; |
| 445 | } |
| 446 | |
Guido van Rossum | 3c54030 | 1997-06-03 22:21:03 +0000 | [diff] [blame] | 447 | static char decomp_decompress__doc__[] = |
| 448 | "decompress(data) -- Return a string containing the decompressed version of the data.\n\n" |
| 449 | "After calling this function, some of the input data may still\n" |
| 450 | "be stored in internal buffers for later processing.\n" |
| 451 | "Call the flush() method to clear these buffers." |
| 452 | ; |
| 453 | |
Guido van Rossum | fb22156 | 1997-04-29 15:38:09 +0000 | [diff] [blame] | 454 | static PyObject * |
Peter Schneider-Kamp | a788a7f | 2000-07-10 09:57:19 +0000 | [diff] [blame] | 455 | PyZlib_objdecompress(compobject *self, PyObject *args) |
Guido van Rossum | fb22156 | 1997-04-29 15:38:09 +0000 | [diff] [blame] | 456 | { |
Jeremy Hylton | 41b9f00 | 1997-08-13 23:19:55 +0000 | [diff] [blame] | 457 | int length, err, inplen; |
Guido van Rossum | fb22156 | 1997-04-29 15:38:09 +0000 | [diff] [blame] | 458 | PyObject *RetVal; |
| 459 | Byte *input; |
Jeremy Hylton | cb91404 | 1997-09-04 23:39:23 +0000 | [diff] [blame] | 460 | unsigned long start_total_out; |
| 461 | |
Guido van Rossum | 43713e5 | 2000-02-29 13:59:29 +0000 | [diff] [blame] | 462 | if (!PyArg_ParseTuple(args, "s#:decompress", &input, &inplen)) |
Guido van Rossum | fb22156 | 1997-04-29 15:38:09 +0000 | [diff] [blame] | 463 | return NULL; |
Jeremy Hylton | cb91404 | 1997-09-04 23:39:23 +0000 | [diff] [blame] | 464 | start_total_out = self->zst.total_out; |
Jeremy Hylton | 41b9f00 | 1997-08-13 23:19:55 +0000 | [diff] [blame] | 465 | RetVal = PyString_FromStringAndSize(NULL, DEFAULTALLOC); |
Jeremy Hylton | cb91404 | 1997-09-04 23:39:23 +0000 | [diff] [blame] | 466 | self->zst.avail_in = inplen; |
| 467 | self->zst.next_in = input; |
Jeremy Hylton | 41b9f00 | 1997-08-13 23:19:55 +0000 | [diff] [blame] | 468 | self->zst.avail_out = length = DEFAULTALLOC; |
Guido van Rossum | ed2554a | 1997-08-18 15:31:24 +0000 | [diff] [blame] | 469 | self->zst.next_out = (unsigned char *)PyString_AsString(RetVal); |
Jeremy Hylton | 41b9f00 | 1997-08-13 23:19:55 +0000 | [diff] [blame] | 470 | err = Z_OK; |
Jeremy Hylton | a74ef66 | 1997-08-13 21:39:18 +0000 | [diff] [blame] | 471 | |
Jeremy Hylton | 41b9f00 | 1997-08-13 23:19:55 +0000 | [diff] [blame] | 472 | while (self->zst.avail_in != 0 && err == Z_OK) |
| 473 | { |
| 474 | err = inflate(&(self->zst), Z_NO_FLUSH); |
| 475 | if (err == Z_OK && self->zst.avail_out <= 0) |
| 476 | { |
| 477 | if (_PyString_Resize(&RetVal, length << 1) == -1) |
| 478 | { |
| 479 | PyErr_SetString(PyExc_MemoryError, |
| 480 | "Can't allocate memory to compress data"); |
| 481 | return NULL; |
| 482 | } |
Guido van Rossum | ed2554a | 1997-08-18 15:31:24 +0000 | [diff] [blame] | 483 | self->zst.next_out = (unsigned char *)PyString_AsString(RetVal) + length; |
Jeremy Hylton | 41b9f00 | 1997-08-13 23:19:55 +0000 | [diff] [blame] | 484 | self->zst.avail_out = length; |
| 485 | length = length << 1; |
| 486 | } |
| 487 | } |
| 488 | |
Jeremy Hylton | cb91404 | 1997-09-04 23:39:23 +0000 | [diff] [blame] | 489 | if (err != Z_OK && err != Z_STREAM_END) |
| 490 | { |
| 491 | if (self->zst.msg == Z_NULL) |
| 492 | PyErr_Format(ZlibError, "Error %i while decompressing", |
| 493 | err); |
| 494 | else |
| 495 | PyErr_Format(ZlibError, "Error %i while decompressing: %.200s", |
| 496 | err, self->zst.msg); |
| 497 | Py_DECREF(RetVal); |
Guido van Rossum | fb22156 | 1997-04-29 15:38:09 +0000 | [diff] [blame] | 498 | return NULL; |
| 499 | } |
Andrew M. Kuchling | b95227d | 1999-03-25 21:21:08 +0000 | [diff] [blame] | 500 | |
| 501 | if (err == Z_STREAM_END) |
| 502 | { |
| 503 | /* The end of the compressed data has been reached, so set |
| 504 | the unused_data attribute to a string containing the |
| 505 | remainder of the data in the string. */ |
| 506 | int pos = self->zst.next_in - input; /* Position in the string */ |
| 507 | Py_XDECREF(self->unused_data); /* Free the original, empty string */ |
| 508 | |
Guido van Rossum | aee9bb2 | 1999-04-12 14:35:48 +0000 | [diff] [blame] | 509 | self->unused_data = PyString_FromStringAndSize((char *)input+pos, |
| 510 | inplen-pos); |
Andrew M. Kuchling | b95227d | 1999-03-25 21:21:08 +0000 | [diff] [blame] | 511 | if (self->unused_data == NULL) return NULL; |
| 512 | } |
| 513 | |
Jeremy Hylton | cb91404 | 1997-09-04 23:39:23 +0000 | [diff] [blame] | 514 | _PyString_Resize(&RetVal, self->zst.total_out - start_total_out); |
Guido van Rossum | fb22156 | 1997-04-29 15:38:09 +0000 | [diff] [blame] | 515 | return RetVal; |
| 516 | } |
| 517 | |
Guido van Rossum | 3c54030 | 1997-06-03 22:21:03 +0000 | [diff] [blame] | 518 | static char comp_flush__doc__[] = |
Jeremy Hylton | a37e244 | 1998-12-18 22:13:11 +0000 | [diff] [blame] | 519 | "flush( [mode] ) -- Return a string containing any remaining compressed data.\n" |
| 520 | "mode can be one of the constants Z_SYNC_FLUSH, Z_FULL_FLUSH, Z_FINISH; the \n" |
| 521 | "default value used when mode is not specified is Z_FINISH.\n" |
| 522 | "If mode == Z_FINISH, the compressor object can no longer be used after\n" |
| 523 | "calling the flush() method. Otherwise, more data can still be compressed.\n" |
Guido van Rossum | 3c54030 | 1997-06-03 22:21:03 +0000 | [diff] [blame] | 524 | ; |
| 525 | |
Guido van Rossum | fb22156 | 1997-04-29 15:38:09 +0000 | [diff] [blame] | 526 | static PyObject * |
Peter Schneider-Kamp | a788a7f | 2000-07-10 09:57:19 +0000 | [diff] [blame] | 527 | PyZlib_flush(compobject *self, PyObject *args) |
Guido van Rossum | fb22156 | 1997-04-29 15:38:09 +0000 | [diff] [blame] | 528 | { |
Jeremy Hylton | 644c17d | 1997-08-14 21:06:42 +0000 | [diff] [blame] | 529 | int length=DEFAULTALLOC, err = Z_OK; |
Guido van Rossum | fb22156 | 1997-04-29 15:38:09 +0000 | [diff] [blame] | 530 | PyObject *RetVal; |
Jeremy Hylton | a37e244 | 1998-12-18 22:13:11 +0000 | [diff] [blame] | 531 | int flushmode = Z_FINISH; |
| 532 | unsigned long start_total_out; |
| 533 | |
Guido van Rossum | 43713e5 | 2000-02-29 13:59:29 +0000 | [diff] [blame] | 534 | if (!PyArg_ParseTuple(args, "|i:flush", &flushmode)) |
Jeremy Hylton | 644c17d | 1997-08-14 21:06:42 +0000 | [diff] [blame] | 535 | return NULL; |
Jeremy Hylton | a37e244 | 1998-12-18 22:13:11 +0000 | [diff] [blame] | 536 | |
| 537 | /* Flushing with Z_NO_FLUSH is a no-op, so there's no point in |
| 538 | doing any work at all; just return an empty string. */ |
| 539 | if (flushmode == Z_NO_FLUSH) |
| 540 | { |
| 541 | return PyString_FromStringAndSize(NULL, 0); |
| 542 | } |
| 543 | |
Jeremy Hylton | 644c17d | 1997-08-14 21:06:42 +0000 | [diff] [blame] | 544 | self->zst.avail_in = 0; |
| 545 | self->zst.next_in = Z_NULL; |
| 546 | if (!(RetVal = PyString_FromStringAndSize(NULL, length))) { |
| 547 | PyErr_SetString(PyExc_MemoryError, |
| 548 | "Can't allocate memory to compress data"); |
| 549 | return NULL; |
| 550 | } |
Jeremy Hylton | a37e244 | 1998-12-18 22:13:11 +0000 | [diff] [blame] | 551 | start_total_out = self->zst.total_out; |
Guido van Rossum | ed2554a | 1997-08-18 15:31:24 +0000 | [diff] [blame] | 552 | self->zst.next_out = (unsigned char *)PyString_AsString(RetVal); |
Jeremy Hylton | 644c17d | 1997-08-14 21:06:42 +0000 | [diff] [blame] | 553 | self->zst.avail_out = length; |
Jeremy Hylton | a37e244 | 1998-12-18 22:13:11 +0000 | [diff] [blame] | 554 | |
| 555 | /* When flushing the zstream, there's no input data. |
| 556 | If zst.avail_out == 0, that means that more output space is |
| 557 | needed to complete the flush operation. */ |
Andrew M. Kuchling | 173156f | 1999-03-22 19:25:30 +0000 | [diff] [blame] | 558 | while (1) { |
| 559 | err = deflate(&(self->zst), flushmode); |
| 560 | |
| 561 | /* If the output is Z_OK, and there's still room in the output |
| 562 | buffer, then the flush is complete. */ |
| 563 | if ( (err == Z_OK) && self->zst.avail_out > 0) break; |
| 564 | |
| 565 | /* A nonzero return indicates some sort of error (but see |
| 566 | the comment for the error handler below) */ |
| 567 | if ( err != Z_OK ) break; |
| 568 | |
| 569 | /* There's no space left for output, so increase the buffer and loop |
| 570 | again */ |
| 571 | if (_PyString_Resize(&RetVal, length << 1) == -1) { |
| 572 | PyErr_SetString(PyExc_MemoryError, |
| 573 | "Can't allocate memory to compress data"); |
| 574 | return NULL; |
Jeremy Hylton | 644c17d | 1997-08-14 21:06:42 +0000 | [diff] [blame] | 575 | } |
Andrew M. Kuchling | 173156f | 1999-03-22 19:25:30 +0000 | [diff] [blame] | 576 | self->zst.next_out = (unsigned char *)PyString_AsString(RetVal) + length; |
| 577 | self->zst.avail_out = length; |
| 578 | length = length << 1; |
Jeremy Hylton | 6892aa3 | 1999-01-06 22:56:24 +0000 | [diff] [blame] | 579 | } |
Jeremy Hylton | a37e244 | 1998-12-18 22:13:11 +0000 | [diff] [blame] | 580 | |
Andrew M. Kuchling | 173156f | 1999-03-22 19:25:30 +0000 | [diff] [blame] | 581 | /* Raise an exception indicating an error. The condition for |
| 582 | detecting a error is kind of complicated; Z_OK indicates no |
| 583 | error, but if the flushmode is Z_FINISH, then Z_STREAM_END is |
| 584 | also not an error. */ |
| 585 | if (err!=Z_OK && !(flushmode == Z_FINISH && err == Z_STREAM_END) ) |
Jeremy Hylton | a37e244 | 1998-12-18 22:13:11 +0000 | [diff] [blame] | 586 | { |
Jeremy Hylton | cb91404 | 1997-09-04 23:39:23 +0000 | [diff] [blame] | 587 | if (self->zst.msg == Z_NULL) |
Jeremy Hylton | a37e244 | 1998-12-18 22:13:11 +0000 | [diff] [blame] | 588 | PyErr_Format(ZlibError, "Error %i while flushing", |
Jeremy Hylton | cb91404 | 1997-09-04 23:39:23 +0000 | [diff] [blame] | 589 | err); |
| 590 | else |
Jeremy Hylton | a37e244 | 1998-12-18 22:13:11 +0000 | [diff] [blame] | 591 | PyErr_Format(ZlibError, "Error %i while flushing: %.200s", |
Jeremy Hylton | cb91404 | 1997-09-04 23:39:23 +0000 | [diff] [blame] | 592 | err, self->zst.msg); |
| 593 | Py_DECREF(RetVal); |
Guido van Rossum | fb22156 | 1997-04-29 15:38:09 +0000 | [diff] [blame] | 594 | return NULL; |
Jeremy Hylton | 6892aa3 | 1999-01-06 22:56:24 +0000 | [diff] [blame] | 595 | } |
Andrew M. Kuchling | 173156f | 1999-03-22 19:25:30 +0000 | [diff] [blame] | 596 | |
| 597 | /* If flushmode is Z_FINISH, we also have to call deflateEnd() to |
| 598 | free various data structures */ |
| 599 | |
Jeremy Hylton | a37e244 | 1998-12-18 22:13:11 +0000 | [diff] [blame] | 600 | if (flushmode == Z_FINISH) { |
| 601 | err=deflateEnd(&(self->zst)); |
| 602 | if (err!=Z_OK) { |
Jeremy Hylton | cb91404 | 1997-09-04 23:39:23 +0000 | [diff] [blame] | 603 | if (self->zst.msg == Z_NULL) |
Jeremy Hylton | a37e244 | 1998-12-18 22:13:11 +0000 | [diff] [blame] | 604 | PyErr_Format(ZlibError, "Error %i from deflateEnd()", |
| 605 | err); |
Jeremy Hylton | cb91404 | 1997-09-04 23:39:23 +0000 | [diff] [blame] | 606 | else |
Jeremy Hylton | a37e244 | 1998-12-18 22:13:11 +0000 | [diff] [blame] | 607 | PyErr_Format(ZlibError, |
| 608 | "Error %i from deflateEnd(): %.200s", |
| 609 | err, self->zst.msg); |
Jeremy Hylton | cb91404 | 1997-09-04 23:39:23 +0000 | [diff] [blame] | 610 | Py_DECREF(RetVal); |
Guido van Rossum | fb22156 | 1997-04-29 15:38:09 +0000 | [diff] [blame] | 611 | return NULL; |
Jeremy Hylton | a37e244 | 1998-12-18 22:13:11 +0000 | [diff] [blame] | 612 | } |
Jeremy Hylton | 644c17d | 1997-08-14 21:06:42 +0000 | [diff] [blame] | 613 | } |
Jeremy Hylton | a37e244 | 1998-12-18 22:13:11 +0000 | [diff] [blame] | 614 | _PyString_Resize(&RetVal, self->zst.total_out - start_total_out); |
Guido van Rossum | fb22156 | 1997-04-29 15:38:09 +0000 | [diff] [blame] | 615 | return RetVal; |
| 616 | } |
| 617 | |
Guido van Rossum | 3c54030 | 1997-06-03 22:21:03 +0000 | [diff] [blame] | 618 | static char decomp_flush__doc__[] = |
| 619 | "flush() -- Return a string containing any remaining decompressed data. " |
| 620 | "The decompressor object can no longer be used after this call." |
| 621 | ; |
| 622 | |
Guido van Rossum | fb22156 | 1997-04-29 15:38:09 +0000 | [diff] [blame] | 623 | static PyObject * |
Peter Schneider-Kamp | a788a7f | 2000-07-10 09:57:19 +0000 | [diff] [blame] | 624 | PyZlib_unflush(compobject *self, PyObject *args) |
Guido van Rossum | fb22156 | 1997-04-29 15:38:09 +0000 | [diff] [blame] | 625 | { |
| 626 | int length=0, err; |
Guido van Rossum | fb22156 | 1997-04-29 15:38:09 +0000 | [diff] [blame] | 627 | PyObject *RetVal; |
| 628 | |
Andrew M. Kuchling | 14f5158 | 2000-08-03 02:04:05 +0000 | [diff] [blame] | 629 | if (!PyArg_ParseTuple(args, "")) |
Jeremy Hylton | 41b9f00 | 1997-08-13 23:19:55 +0000 | [diff] [blame] | 630 | return NULL; |
Jeremy Hylton | 644c17d | 1997-08-14 21:06:42 +0000 | [diff] [blame] | 631 | if (!(RetVal = PyString_FromStringAndSize(NULL, DEFAULTALLOC))) |
| 632 | { |
| 633 | PyErr_SetString(PyExc_MemoryError, |
| 634 | "Can't allocate memory to decompress data"); |
| 635 | return NULL; |
| 636 | } |
Guido van Rossum | fb22156 | 1997-04-29 15:38:09 +0000 | [diff] [blame] | 637 | self->zst.avail_in=0; |
Guido van Rossum | ed2554a | 1997-08-18 15:31:24 +0000 | [diff] [blame] | 638 | self->zst.next_out = (unsigned char *)PyString_AsString(RetVal); |
Jeremy Hylton | 41b9f00 | 1997-08-13 23:19:55 +0000 | [diff] [blame] | 639 | length = self->zst.avail_out = DEFAULTALLOC; |
| 640 | |
Guido van Rossum | b729a1d | 1999-04-07 20:23:17 +0000 | [diff] [blame] | 641 | /* I suspect that Z_BUF_ERROR is the only error code we need to check for |
| 642 | in the following loop, but will leave the Z_OK in for now to avoid |
| 643 | destabilizing this function. --amk */ |
Jeremy Hylton | 41b9f00 | 1997-08-13 23:19:55 +0000 | [diff] [blame] | 644 | err = Z_OK; |
Guido van Rossum | b729a1d | 1999-04-07 20:23:17 +0000 | [diff] [blame] | 645 | while ( err == Z_OK ) |
Jeremy Hylton | 41b9f00 | 1997-08-13 23:19:55 +0000 | [diff] [blame] | 646 | { |
| 647 | err = inflate(&(self->zst), Z_FINISH); |
Guido van Rossum | b729a1d | 1999-04-07 20:23:17 +0000 | [diff] [blame] | 648 | if ( ( err == Z_OK || err == Z_BUF_ERROR ) && self->zst.avail_out == 0) |
Jeremy Hylton | 41b9f00 | 1997-08-13 23:19:55 +0000 | [diff] [blame] | 649 | { |
| 650 | if (_PyString_Resize(&RetVal, length << 1) == -1) |
| 651 | { |
| 652 | PyErr_SetString(PyExc_MemoryError, |
| 653 | "Can't allocate memory to decompress data"); |
| 654 | return NULL; |
| 655 | } |
Guido van Rossum | ed2554a | 1997-08-18 15:31:24 +0000 | [diff] [blame] | 656 | self->zst.next_out = (unsigned char *)PyString_AsString(RetVal) + length; |
Jeremy Hylton | 41b9f00 | 1997-08-13 23:19:55 +0000 | [diff] [blame] | 657 | self->zst.avail_out = length; |
| 658 | length = length << 1; |
Guido van Rossum | b729a1d | 1999-04-07 20:23:17 +0000 | [diff] [blame] | 659 | err = Z_OK; |
Jeremy Hylton | 41b9f00 | 1997-08-13 23:19:55 +0000 | [diff] [blame] | 660 | } |
| 661 | } |
Guido van Rossum | fb22156 | 1997-04-29 15:38:09 +0000 | [diff] [blame] | 662 | if (err!=Z_STREAM_END) |
Jeremy Hylton | cb91404 | 1997-09-04 23:39:23 +0000 | [diff] [blame] | 663 | { |
| 664 | if (self->zst.msg == Z_NULL) |
| 665 | PyErr_Format(ZlibError, "Error %i while decompressing", |
| 666 | err); |
| 667 | else |
| 668 | PyErr_Format(ZlibError, "Error %i while decompressing: %.200s", |
| 669 | err, self->zst.msg); |
| 670 | Py_DECREF(RetVal); |
Guido van Rossum | fb22156 | 1997-04-29 15:38:09 +0000 | [diff] [blame] | 671 | return NULL; |
Jeremy Hylton | cb91404 | 1997-09-04 23:39:23 +0000 | [diff] [blame] | 672 | } |
Guido van Rossum | fb22156 | 1997-04-29 15:38:09 +0000 | [diff] [blame] | 673 | err=inflateEnd(&(self->zst)); |
| 674 | if (err!=Z_OK) |
Jeremy Hylton | cb91404 | 1997-09-04 23:39:23 +0000 | [diff] [blame] | 675 | { |
| 676 | if (self->zst.msg == Z_NULL) |
| 677 | PyErr_Format(ZlibError, |
| 678 | "Error %i while flushing decompression object", |
| 679 | err); |
| 680 | else |
| 681 | PyErr_Format(ZlibError, |
| 682 | "Error %i while flushing decompression object: %.200s", |
| 683 | err, self->zst.msg); |
| 684 | Py_DECREF(RetVal); |
Guido van Rossum | fb22156 | 1997-04-29 15:38:09 +0000 | [diff] [blame] | 685 | return NULL; |
Jeremy Hylton | cb91404 | 1997-09-04 23:39:23 +0000 | [diff] [blame] | 686 | } |
Jeremy Hylton | 644c17d | 1997-08-14 21:06:42 +0000 | [diff] [blame] | 687 | _PyString_Resize(&RetVal, |
| 688 | (char *)self->zst.next_out - PyString_AsString(RetVal)); |
Guido van Rossum | fb22156 | 1997-04-29 15:38:09 +0000 | [diff] [blame] | 689 | return RetVal; |
| 690 | } |
| 691 | |
| 692 | static PyMethodDef comp_methods[] = |
| 693 | { |
Andrew M. Kuchling | 14f5158 | 2000-08-03 02:04:05 +0000 | [diff] [blame] | 694 | {"compress", (binaryfunc)PyZlib_objcompress, |
| 695 | METH_VARARGS, comp_compress__doc__}, |
| 696 | {"flush", (binaryfunc)PyZlib_flush, |
| 697 | METH_VARARGS, comp_flush__doc__}, |
Guido van Rossum | fb22156 | 1997-04-29 15:38:09 +0000 | [diff] [blame] | 698 | {NULL, NULL} |
| 699 | }; |
| 700 | |
| 701 | static PyMethodDef Decomp_methods[] = |
| 702 | { |
Andrew M. Kuchling | 14f5158 | 2000-08-03 02:04:05 +0000 | [diff] [blame] | 703 | {"decompress", (binaryfunc)PyZlib_objdecompress, |
| 704 | METH_VARARGS, decomp_decompress__doc__}, |
| 705 | {"flush", (binaryfunc)PyZlib_unflush, |
| 706 | METH_VARARGS, decomp_flush__doc__}, |
Guido van Rossum | fb22156 | 1997-04-29 15:38:09 +0000 | [diff] [blame] | 707 | {NULL, NULL} |
| 708 | }; |
| 709 | |
| 710 | static PyObject * |
Peter Schneider-Kamp | a788a7f | 2000-07-10 09:57:19 +0000 | [diff] [blame] | 711 | Comp_getattr(compobject *self, char *name) |
Guido van Rossum | fb22156 | 1997-04-29 15:38:09 +0000 | [diff] [blame] | 712 | { |
| 713 | return Py_FindMethod(comp_methods, (PyObject *)self, name); |
| 714 | } |
| 715 | |
| 716 | static PyObject * |
Peter Schneider-Kamp | a788a7f | 2000-07-10 09:57:19 +0000 | [diff] [blame] | 717 | Decomp_getattr(compobject *self, char *name) |
Guido van Rossum | fb22156 | 1997-04-29 15:38:09 +0000 | [diff] [blame] | 718 | { |
Andrew M. Kuchling | b95227d | 1999-03-25 21:21:08 +0000 | [diff] [blame] | 719 | if (strcmp(name, "unused_data") == 0) |
| 720 | { |
| 721 | Py_INCREF(self->unused_data); |
| 722 | return self->unused_data; |
| 723 | } |
Guido van Rossum | fb22156 | 1997-04-29 15:38:09 +0000 | [diff] [blame] | 724 | return Py_FindMethod(Decomp_methods, (PyObject *)self, name); |
| 725 | } |
| 726 | |
Guido van Rossum | 3c54030 | 1997-06-03 22:21:03 +0000 | [diff] [blame] | 727 | static char adler32__doc__[] = |
| 728 | "adler32(string) -- Compute an Adler-32 checksum of string, using " |
| 729 | "a default starting value, and returning an integer value.\n" |
| 730 | "adler32(string, value) -- Compute an Adler-32 checksum of string, using " |
| 731 | "the starting value provided, and returning an integer value\n" |
| 732 | ; |
| 733 | |
Guido van Rossum | fb22156 | 1997-04-29 15:38:09 +0000 | [diff] [blame] | 734 | static PyObject * |
Peter Schneider-Kamp | a788a7f | 2000-07-10 09:57:19 +0000 | [diff] [blame] | 735 | PyZlib_adler32(PyObject *self, PyObject *args) |
Guido van Rossum | fb22156 | 1997-04-29 15:38:09 +0000 | [diff] [blame] | 736 | { |
Jeremy Hylton | cb91404 | 1997-09-04 23:39:23 +0000 | [diff] [blame] | 737 | uLong adler32val=adler32(0L, Z_NULL, 0); |
| 738 | Byte *buf; |
| 739 | int len; |
Guido van Rossum | fb22156 | 1997-04-29 15:38:09 +0000 | [diff] [blame] | 740 | |
Guido van Rossum | 43713e5 | 2000-02-29 13:59:29 +0000 | [diff] [blame] | 741 | if (!PyArg_ParseTuple(args, "s#|l:adler32", &buf, &len, &adler32val)) |
Jeremy Hylton | cb91404 | 1997-09-04 23:39:23 +0000 | [diff] [blame] | 742 | { |
| 743 | return NULL; |
| 744 | } |
| 745 | adler32val = adler32(adler32val, buf, len); |
| 746 | return PyInt_FromLong(adler32val); |
Guido van Rossum | fb22156 | 1997-04-29 15:38:09 +0000 | [diff] [blame] | 747 | } |
| 748 | |
Guido van Rossum | 3c54030 | 1997-06-03 22:21:03 +0000 | [diff] [blame] | 749 | static char crc32__doc__[] = |
| 750 | "crc32(string) -- Compute a CRC-32 checksum of string, using " |
| 751 | "a default starting value, and returning an integer value.\n" |
| 752 | "crc32(string, value) -- Compute a CRC-32 checksum of string, using " |
| 753 | "the starting value provided, and returning an integer value.\n" |
| 754 | ; |
Guido van Rossum | fb22156 | 1997-04-29 15:38:09 +0000 | [diff] [blame] | 755 | |
| 756 | static PyObject * |
Peter Schneider-Kamp | a788a7f | 2000-07-10 09:57:19 +0000 | [diff] [blame] | 757 | PyZlib_crc32(PyObject *self, PyObject *args) |
Guido van Rossum | fb22156 | 1997-04-29 15:38:09 +0000 | [diff] [blame] | 758 | { |
Jeremy Hylton | cb91404 | 1997-09-04 23:39:23 +0000 | [diff] [blame] | 759 | uLong crc32val=crc32(0L, Z_NULL, 0); |
| 760 | Byte *buf; |
| 761 | int len; |
Guido van Rossum | 43713e5 | 2000-02-29 13:59:29 +0000 | [diff] [blame] | 762 | if (!PyArg_ParseTuple(args, "s#|l:crc32", &buf, &len, &crc32val)) |
Jeremy Hylton | cb91404 | 1997-09-04 23:39:23 +0000 | [diff] [blame] | 763 | { |
| 764 | return NULL; |
| 765 | } |
| 766 | crc32val = crc32(crc32val, buf, len); |
| 767 | return PyInt_FromLong(crc32val); |
Guido van Rossum | fb22156 | 1997-04-29 15:38:09 +0000 | [diff] [blame] | 768 | } |
| 769 | |
| 770 | |
| 771 | static PyMethodDef zlib_methods[] = |
| 772 | { |
Andrew M. Kuchling | 14f5158 | 2000-08-03 02:04:05 +0000 | [diff] [blame] | 773 | {"adler32", (PyCFunction)PyZlib_adler32, |
| 774 | METH_VARARGS, adler32__doc__}, |
| 775 | {"compress", (PyCFunction)PyZlib_compress, |
| 776 | METH_VARARGS, compress__doc__}, |
| 777 | {"compressobj", (PyCFunction)PyZlib_compressobj, |
| 778 | METH_VARARGS, compressobj__doc__}, |
| 779 | {"crc32", (PyCFunction)PyZlib_crc32, |
| 780 | METH_VARARGS, crc32__doc__}, |
| 781 | {"decompress", (PyCFunction)PyZlib_decompress, |
| 782 | METH_VARARGS, decompress__doc__}, |
| 783 | {"decompressobj", (PyCFunction)PyZlib_decompressobj, |
| 784 | METH_VARARGS, decompressobj__doc__}, |
| 785 | {NULL, NULL} |
Guido van Rossum | fb22156 | 1997-04-29 15:38:09 +0000 | [diff] [blame] | 786 | }; |
| 787 | |
| 788 | statichere PyTypeObject Comptype = { |
Guido van Rossum | 9ec0f8b | 1997-12-18 05:21:29 +0000 | [diff] [blame] | 789 | PyObject_HEAD_INIT(0) |
Guido van Rossum | fb22156 | 1997-04-29 15:38:09 +0000 | [diff] [blame] | 790 | 0, |
| 791 | "Compress", |
| 792 | sizeof(compobject), |
| 793 | 0, |
| 794 | (destructor)Comp_dealloc, /*tp_dealloc*/ |
| 795 | 0, /*tp_print*/ |
| 796 | (getattrfunc)Comp_getattr, /*tp_getattr*/ |
| 797 | 0, /*tp_setattr*/ |
| 798 | 0, /*tp_compare*/ |
| 799 | 0, /*tp_repr*/ |
| 800 | 0, /*tp_as_number*/ |
| 801 | 0, /*tp_as_sequence*/ |
| 802 | 0, /*tp_as_mapping*/ |
| 803 | }; |
| 804 | |
| 805 | statichere PyTypeObject Decomptype = { |
Guido van Rossum | 9ec0f8b | 1997-12-18 05:21:29 +0000 | [diff] [blame] | 806 | PyObject_HEAD_INIT(0) |
Guido van Rossum | fb22156 | 1997-04-29 15:38:09 +0000 | [diff] [blame] | 807 | 0, |
| 808 | "Decompress", |
| 809 | sizeof(compobject), |
| 810 | 0, |
| 811 | (destructor)Decomp_dealloc, /*tp_dealloc*/ |
| 812 | 0, /*tp_print*/ |
| 813 | (getattrfunc)Decomp_getattr, /*tp_getattr*/ |
| 814 | 0, /*tp_setattr*/ |
| 815 | 0, /*tp_compare*/ |
| 816 | 0, /*tp_repr*/ |
| 817 | 0, /*tp_as_number*/ |
| 818 | 0, /*tp_as_sequence*/ |
| 819 | 0, /*tp_as_mapping*/ |
| 820 | }; |
| 821 | |
| 822 | /* The following insint() routine was blatantly ripped off from |
| 823 | socketmodule.c */ |
| 824 | |
| 825 | /* Convenience routine to export an integer value. |
| 826 | For simplicity, errors (which are unlikely anyway) are ignored. */ |
| 827 | static void |
Peter Schneider-Kamp | a788a7f | 2000-07-10 09:57:19 +0000 | [diff] [blame] | 828 | insint(PyObject *d, char *name, int value) |
Guido van Rossum | fb22156 | 1997-04-29 15:38:09 +0000 | [diff] [blame] | 829 | { |
| 830 | PyObject *v = PyInt_FromLong((long) value); |
| 831 | if (v == NULL) { |
| 832 | /* Don't bother reporting this error */ |
| 833 | PyErr_Clear(); |
| 834 | } |
| 835 | else { |
| 836 | PyDict_SetItemString(d, name, v); |
| 837 | Py_DECREF(v); |
| 838 | } |
| 839 | } |
| 840 | |
Guido van Rossum | 3c54030 | 1997-06-03 22:21:03 +0000 | [diff] [blame] | 841 | static char zlib_module_documentation[]= |
| 842 | "The functions in this module allow compression and decompression " |
| 843 | "using the zlib library, which is based on GNU zip. \n\n" |
| 844 | "adler32(string) -- Compute an Adler-32 checksum.\n" |
| 845 | "adler32(string, start) -- Compute an Adler-32 checksum using a given starting value.\n" |
| 846 | "compress(string) -- Compress a string.\n" |
| 847 | "compress(string, level) -- Compress a string with the given level of compression (1--9).\n" |
| 848 | "compressobj([level]) -- Return a compressor object.\n" |
| 849 | "crc32(string) -- Compute a CRC-32 checksum.\n" |
| 850 | "crc32(string, start) -- Compute a CRC-32 checksum using a given starting value.\n" |
Andrew M. Kuchling | 313a3e3 | 1999-12-20 22:13:38 +0000 | [diff] [blame] | 851 | "decompress(string,[wbits],[bufsize]) -- Decompresses a compressed string.\n" |
Guido van Rossum | 3c54030 | 1997-06-03 22:21:03 +0000 | [diff] [blame] | 852 | "decompressobj([wbits]) -- Return a decompressor object (wbits=window buffer size).\n\n" |
| 853 | "Compressor objects support compress() and flush() methods; decompressor \n" |
| 854 | "objects support decompress() and flush()." |
| 855 | ; |
| 856 | |
Guido van Rossum | 3886bb6 | 1998-12-04 18:50:17 +0000 | [diff] [blame] | 857 | DL_EXPORT(void) |
Thomas Wouters | f3f33dc | 2000-07-21 06:00:07 +0000 | [diff] [blame] | 858 | PyInit_zlib(void) |
Guido van Rossum | fb22156 | 1997-04-29 15:38:09 +0000 | [diff] [blame] | 859 | { |
Jeremy Hylton | cb91404 | 1997-09-04 23:39:23 +0000 | [diff] [blame] | 860 | PyObject *m, *d, *ver; |
Guido van Rossum | 9ec0f8b | 1997-12-18 05:21:29 +0000 | [diff] [blame] | 861 | Comptype.ob_type = &PyType_Type; |
| 862 | Decomptype.ob_type = &PyType_Type; |
Guido van Rossum | 3c54030 | 1997-06-03 22:21:03 +0000 | [diff] [blame] | 863 | m = Py_InitModule4("zlib", zlib_methods, |
| 864 | zlib_module_documentation, |
| 865 | (PyObject*)NULL,PYTHON_API_VERSION); |
Guido van Rossum | fb22156 | 1997-04-29 15:38:09 +0000 | [diff] [blame] | 866 | d = PyModule_GetDict(m); |
Guido van Rossum | 0cb96de | 1997-10-01 04:29:29 +0000 | [diff] [blame] | 867 | ZlibError = PyErr_NewException("zlib.error", NULL, NULL); |
Fred Drake | 8972dfd | 1999-12-22 16:13:54 +0000 | [diff] [blame] | 868 | if (ZlibError != NULL) |
| 869 | PyDict_SetItemString(d, "error", ZlibError); |
Jeremy Hylton | cb91404 | 1997-09-04 23:39:23 +0000 | [diff] [blame] | 870 | |
Guido van Rossum | fb22156 | 1997-04-29 15:38:09 +0000 | [diff] [blame] | 871 | insint(d, "MAX_WBITS", MAX_WBITS); |
| 872 | insint(d, "DEFLATED", DEFLATED); |
| 873 | insint(d, "DEF_MEM_LEVEL", DEF_MEM_LEVEL); |
Jeremy Hylton | cb91404 | 1997-09-04 23:39:23 +0000 | [diff] [blame] | 874 | insint(d, "Z_BEST_SPEED", Z_BEST_SPEED); |
| 875 | insint(d, "Z_BEST_COMPRESSION", Z_BEST_COMPRESSION); |
| 876 | insint(d, "Z_DEFAULT_COMPRESSION", Z_DEFAULT_COMPRESSION); |
| 877 | insint(d, "Z_FILTERED", Z_FILTERED); |
| 878 | insint(d, "Z_HUFFMAN_ONLY", Z_HUFFMAN_ONLY); |
| 879 | insint(d, "Z_DEFAULT_STRATEGY", Z_DEFAULT_STRATEGY); |
Jeremy Hylton | a37e244 | 1998-12-18 22:13:11 +0000 | [diff] [blame] | 880 | |
| 881 | insint(d, "Z_FINISH", Z_FINISH); |
| 882 | insint(d, "Z_NO_FLUSH", Z_NO_FLUSH); |
| 883 | insint(d, "Z_SYNC_FLUSH", Z_SYNC_FLUSH); |
| 884 | insint(d, "Z_FULL_FLUSH", Z_FULL_FLUSH); |
| 885 | |
Jeremy Hylton | cb91404 | 1997-09-04 23:39:23 +0000 | [diff] [blame] | 886 | ver = PyString_FromString(ZLIB_VERSION); |
Fred Drake | 8972dfd | 1999-12-22 16:13:54 +0000 | [diff] [blame] | 887 | if (ver != NULL) { |
| 888 | PyDict_SetItemString(d, "ZLIB_VERSION", ver); |
| 889 | Py_DECREF(ver); |
| 890 | } |
Guido van Rossum | fb22156 | 1997-04-29 15:38:09 +0000 | [diff] [blame] | 891 | } |