cpython-lru_cache-weakref: Modules/zlibmodule.c annotate

annotate Modules/zlibmodule.c @ 61524:4b10ef8a024c 3.1

Merged revisions 81100 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ................ r81100 | antoine.pitrou | 2010-05-12 01:46:02 +0200 (mer., 12 mai 2010) | 10 lines Merged revisions 81098 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r81098 | antoine.pitrou | 2010-05-12 01:42:28 +0200 (mer., 12 mai 2010) | 5 lines Issue #8681: Make the zlib module's error messages more informative when the zlib itself doesn't give any detailed explanation. ........ ................

author	Antoine Pitrou <solipsis@pitrou.net>
date	Tue, 11 May 2010 23:49:58 +0000
parents	f197407bdba2
children	f8a77fd675f5 4549426ee4d6

rev	line source
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	1 /* zlibmodule.c -- gzip-compatible data compression */
20327 54f05b9b1fc4 Update URL. Fixes bug #468118. Martin v. Löwis <martin@v.loewis.de> parents: 19810 diff changeset	2 /* See http://www.gzip.org/zlib/ */
16368 c696a52c2621 Fix [ Bug #129293 ] zlib library used for binary win32 distribution can crash Mark Hammond <mhammond@skippinet.com.au> parents: 15098 diff changeset	3
16369 c04ca6cba1e3 Docs for new Windows zlib build procedure. Tim Peters <tim.peters@gmail.com> parents: 16368 diff changeset	4 /* Windows users: read Python's PCbuild\readme.txt */
16368 c696a52c2621 Fix [ Bug #129293 ] zlib library used for binary win32 distribution can crash Mark Hammond <mhammond@skippinet.com.au> parents: 15098 diff changeset	5
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	6
5723 beee351f1f72 Small changes (casts etc.) by Jack, for Mac compilation. Guido van Rossum <guido@python.org> parents: 5722 diff changeset	7 #include "Python.h"
48413 7e56016a6565 #3247 Get rid of Py_FindMethod; use tp_members instead. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47580 diff changeset	8 #include "structmember.h"
5723 beee351f1f72 Small changes (casts etc.) by Jack, for Mac compilation. Guido van Rossum <guido@python.org> parents: 5722 diff changeset	9 #include "zlib.h"
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	10
19798 091c01d07d98 Patch #450702: allow threads when calling into zlib, protect usage of Martin v. Löwis <martin@v.loewis.de> parents: 16735 diff changeset	11 #ifdef WITH_THREAD
50453 400cfcaa8d46 Issue #4738: finer-grained locking in the zlib module. Antoine Pitrou <solipsis@pitrou.net> parents: 49051 diff changeset	12 #include "pythread.h"
400cfcaa8d46 Issue #4738: finer-grained locking in the zlib module. Antoine Pitrou <solipsis@pitrou.net> parents: 49051 diff changeset	13 #define ENTER_ZLIB(obj) \
400cfcaa8d46 Issue #4738: finer-grained locking in the zlib module. Antoine Pitrou <solipsis@pitrou.net> parents: 49051 diff changeset	14 Py_BEGIN_ALLOW_THREADS; \
400cfcaa8d46 Issue #4738: finer-grained locking in the zlib module. Antoine Pitrou <solipsis@pitrou.net> parents: 49051 diff changeset	15 PyThread_acquire_lock((obj)->lock, 1); \
400cfcaa8d46 Issue #4738: finer-grained locking in the zlib module. Antoine Pitrou <solipsis@pitrou.net> parents: 49051 diff changeset	16 Py_END_ALLOW_THREADS;
400cfcaa8d46 Issue #4738: finer-grained locking in the zlib module. Antoine Pitrou <solipsis@pitrou.net> parents: 49051 diff changeset	17 #define LEAVE_ZLIB(obj) PyThread_release_lock((obj)->lock);
19798 091c01d07d98 Patch #450702: allow threads when calling into zlib, protect usage of Martin v. Löwis <martin@v.loewis.de> parents: 16735 diff changeset	18 #else
50453 400cfcaa8d46 Issue #4738: finer-grained locking in the zlib module. Antoine Pitrou <solipsis@pitrou.net> parents: 49051 diff changeset	19 #define ENTER_ZLIB(obj)
400cfcaa8d46 Issue #4738: finer-grained locking in the zlib module. Antoine Pitrou <solipsis@pitrou.net> parents: 49051 diff changeset	20 #define LEAVE_ZLIB(obj)
19798 091c01d07d98 Patch #450702: allow threads when calling into zlib, protect usage of Martin v. Löwis <martin@v.loewis.de> parents: 16735 diff changeset	21 #endif
091c01d07d98 Patch #450702: allow threads when calling into zlib, protect usage of Martin v. Löwis <martin@v.loewis.de> parents: 16735 diff changeset	22
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	23 /* The following parameters are copied from zutil.h, version 0.95 */
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	24 #define DEFLATED 8
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	25 #if MAX_MEM_LEVEL >= 8
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	26 # define DEF_MEM_LEVEL 8
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	27 #else
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	28 # define DEF_MEM_LEVEL MAX_MEM_LEVEL
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	29 #endif
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	30 #define DEF_WBITS MAX_WBITS
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	31
10538 ccee3c28b7ef Patch by Andrew Kuchling to unflush() (flush() for deflating). Guido van Rossum <guido@python.org> parents: 10467 diff changeset	32 /* The output buffer will be increased in chunks of DEFAULTALLOC bytes. */
ccee3c28b7ef Patch by Andrew Kuchling to unflush() (flush() for deflating). Guido van Rossum <guido@python.org> parents: 10467 diff changeset	33 #define DEFAULTALLOC (16*1024)
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	34
24280 1598a1e473e2 staticforward bites the dust. Jeremy Hylton <jeremy@alum.mit.edu> parents: 23832 diff changeset	35 static PyTypeObject Comptype;
1598a1e473e2 staticforward bites the dust. Jeremy Hylton <jeremy@alum.mit.edu> parents: 23832 diff changeset	36 static PyTypeObject Decomptype;
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	37
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	38 static PyObject *ZlibError;
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	39
20484 1a9494f9edb2 Trimmed trailing whitespace. Tim Peters <tim.peters@gmail.com> parents: 20483 diff changeset	40 typedef struct
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	41 {
20469 c46e94fd6986 Reformat! Jeremy Hylton <jeremy@alum.mit.edu> parents: 20466 diff changeset	42 PyObject_HEAD
c46e94fd6986 Reformat! Jeremy Hylton <jeremy@alum.mit.edu> parents: 20466 diff changeset	43 z_stream zst;
c46e94fd6986 Reformat! Jeremy Hylton <jeremy@alum.mit.edu> parents: 20466 diff changeset	44 PyObject *unused_data;
c46e94fd6986 Reformat! Jeremy Hylton <jeremy@alum.mit.edu> parents: 20466 diff changeset	45 PyObject *unconsumed_tail;
c46e94fd6986 Reformat! Jeremy Hylton <jeremy@alum.mit.edu> parents: 20466 diff changeset	46 int is_initialised;
50453 400cfcaa8d46 Issue #4738: finer-grained locking in the zlib module. Antoine Pitrou <solipsis@pitrou.net> parents: 49051 diff changeset	47 #ifdef WITH_THREAD
400cfcaa8d46 Issue #4738: finer-grained locking in the zlib module. Antoine Pitrou <solipsis@pitrou.net> parents: 49051 diff changeset	48 PyThread_type_lock lock;
400cfcaa8d46 Issue #4738: finer-grained locking in the zlib module. Antoine Pitrou <solipsis@pitrou.net> parents: 49051 diff changeset	49 #endif
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	50 } compobject;
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	51
20474 a5a30ba2899f Add zlib_error() helper. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20470 diff changeset	52 static void
a5a30ba2899f Add zlib_error() helper. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20470 diff changeset	53 zlib_error(z_stream zst, int err, char *msg)
a5a30ba2899f Add zlib_error() helper. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20470 diff changeset	54 {
61524 4b10ef8a024c Merged revisions 81100 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	55 const char *zmsg = zst.msg;
4b10ef8a024c Merged revisions 81100 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	56 if (zmsg == Z_NULL) {
4b10ef8a024c Merged revisions 81100 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	57 switch (err) {
4b10ef8a024c Merged revisions 81100 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	58 case Z_BUF_ERROR:
4b10ef8a024c Merged revisions 81100 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	59 zmsg = "incomplete or truncated stream";
4b10ef8a024c Merged revisions 81100 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	60 break;
4b10ef8a024c Merged revisions 81100 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	61 case Z_STREAM_ERROR:
4b10ef8a024c Merged revisions 81100 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	62 zmsg = "inconsistent stream state";
4b10ef8a024c Merged revisions 81100 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	63 break;
4b10ef8a024c Merged revisions 81100 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	64 case Z_DATA_ERROR:
4b10ef8a024c Merged revisions 81100 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	65 zmsg = "invalid input data";
4b10ef8a024c Merged revisions 81100 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	66 break;
4b10ef8a024c Merged revisions 81100 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	67 }
4b10ef8a024c Merged revisions 81100 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	68 }
4b10ef8a024c Merged revisions 81100 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	69 if (zmsg == Z_NULL)
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	70 PyErr_Format(ZlibError, "Error %d %s", err, msg);
20474 a5a30ba2899f Add zlib_error() helper. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20470 diff changeset	71 else
61524 4b10ef8a024c Merged revisions 81100 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	72 PyErr_Format(ZlibError, "Error %d %s: %.200s", err, msg, zmsg);
20474 a5a30ba2899f Add zlib_error() helper. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20470 diff changeset	73 }
a5a30ba2899f Add zlib_error() helper. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20470 diff changeset	74
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23295 diff changeset	75 PyDoc_STRVAR(compressobj__doc__,
20485 4af8d24fa691 Simplify and regularize docstrings. Also reformat so that each docstring Tim Peters <tim.peters@gmail.com> parents: 20484 diff changeset	76 "compressobj([level]) -- Return a compressor object.\n"
4af8d24fa691 Simplify and regularize docstrings. Also reformat so that each docstring Tim Peters <tim.peters@gmail.com> parents: 20484 diff changeset	77 "\n"
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23295 diff changeset	78 "Optional arg level is the compression level, in 1-9.");
5722 6c9736865608 Doc strings (AMK). Guido van Rossum <guido@python.org> parents: 5352 diff changeset	79
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23295 diff changeset	80 PyDoc_STRVAR(decompressobj__doc__,
20485 4af8d24fa691 Simplify and regularize docstrings. Also reformat so that each docstring Tim Peters <tim.peters@gmail.com> parents: 20484 diff changeset	81 "decompressobj([wbits]) -- Return a decompressor object.\n"
4af8d24fa691 Simplify and regularize docstrings. Also reformat so that each docstring Tim Peters <tim.peters@gmail.com> parents: 20484 diff changeset	82 "\n"
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23295 diff changeset	83 "Optional arg wbits is the window buffer size.");
5722 6c9736865608 Doc strings (AMK). Guido van Rossum <guido@python.org> parents: 5352 diff changeset	84
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	85 static compobject *
13496 03bc51e43f7a ANSI-fication Peter Schneider-Kamp <nowonder@nowonder.de> parents: 12576 diff changeset	86 newcompobject(PyTypeObject *type)
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	87 {
20484 1a9494f9edb2 Trimmed trailing whitespace. Tim Peters <tim.peters@gmail.com> parents: 20483 diff changeset	88 compobject *self;
20469 c46e94fd6986 Reformat! Jeremy Hylton <jeremy@alum.mit.edu> parents: 20466 diff changeset	89 self = PyObject_New(compobject, type);
c46e94fd6986 Reformat! Jeremy Hylton <jeremy@alum.mit.edu> parents: 20466 diff changeset	90 if (self == NULL)
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	91 return NULL;
20469 c46e94fd6986 Reformat! Jeremy Hylton <jeremy@alum.mit.edu> parents: 20466 diff changeset	92 self->is_initialised = 0;
49051 c1a8f6b648ea Fixes release blocker issue #3492 and #3790. Gregory P. Smith <greg@mad-scientist.com> parents: 48683 diff changeset	93 self->unused_data = PyBytes_FromStringAndSize("", 0);
20469 c46e94fd6986 Reformat! Jeremy Hylton <jeremy@alum.mit.edu> parents: 20466 diff changeset	94 if (self->unused_data == NULL) {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	95 Py_DECREF(self);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	96 return NULL;
20469 c46e94fd6986 Reformat! Jeremy Hylton <jeremy@alum.mit.edu> parents: 20466 diff changeset	97 }
49051 c1a8f6b648ea Fixes release blocker issue #3492 and #3790. Gregory P. Smith <greg@mad-scientist.com> parents: 48683 diff changeset	98 self->unconsumed_tail = PyBytes_FromStringAndSize("", 0);
20469 c46e94fd6986 Reformat! Jeremy Hylton <jeremy@alum.mit.edu> parents: 20466 diff changeset	99 if (self->unconsumed_tail == NULL) {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	100 Py_DECREF(self);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	101 return NULL;
20469 c46e94fd6986 Reformat! Jeremy Hylton <jeremy@alum.mit.edu> parents: 20466 diff changeset	102 }
50453 400cfcaa8d46 Issue #4738: finer-grained locking in the zlib module. Antoine Pitrou <solipsis@pitrou.net> parents: 49051 diff changeset	103 #ifdef WITH_THREAD
400cfcaa8d46 Issue #4738: finer-grained locking in the zlib module. Antoine Pitrou <solipsis@pitrou.net> parents: 49051 diff changeset	104 self->lock = PyThread_allocate_lock();
400cfcaa8d46 Issue #4738: finer-grained locking in the zlib module. Antoine Pitrou <solipsis@pitrou.net> parents: 49051 diff changeset	105 #endif
20469 c46e94fd6986 Reformat! Jeremy Hylton <jeremy@alum.mit.edu> parents: 20466 diff changeset	106 return self;
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	107 }
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	108
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23295 diff changeset	109 PyDoc_STRVAR(compress__doc__,
20485 4af8d24fa691 Simplify and regularize docstrings. Also reformat so that each docstring Tim Peters <tim.peters@gmail.com> parents: 20484 diff changeset	110 "compress(string[, level]) -- Returned compressed string.\n"
4af8d24fa691 Simplify and regularize docstrings. Also reformat so that each docstring Tim Peters <tim.peters@gmail.com> parents: 20484 diff changeset	111 "\n"
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23295 diff changeset	112 "Optional arg level is the compression level, in 1-9.");
5722 6c9736865608 Doc strings (AMK). Guido van Rossum <guido@python.org> parents: 5352 diff changeset	113
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	114 static PyObject *
13496 03bc51e43f7a ANSI-fication Peter Schneider-Kamp <nowonder@nowonder.de> parents: 12576 diff changeset	115 PyZlib_compress(PyObject self, PyObject args)
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	116 {
20469 c46e94fd6986 Reformat! Jeremy Hylton <jeremy@alum.mit.edu> parents: 20466 diff changeset	117 PyObject *ReturnVal = NULL;
48683 cd3b0b7fd8e1 Merged revisions 65654 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 48413 diff changeset	118 Py_buffer pinput;
20469 c46e94fd6986 Reformat! Jeremy Hylton <jeremy@alum.mit.edu> parents: 20466 diff changeset	119 Byte input, output;
c46e94fd6986 Reformat! Jeremy Hylton <jeremy@alum.mit.edu> parents: 20466 diff changeset	120 int length, level=Z_DEFAULT_COMPRESSION, err;
c46e94fd6986 Reformat! Jeremy Hylton <jeremy@alum.mit.edu> parents: 20466 diff changeset	121 z_stream zst;
20484 1a9494f9edb2 Trimmed trailing whitespace. Tim Peters <tim.peters@gmail.com> parents: 20483 diff changeset	122
20469 c46e94fd6986 Reformat! Jeremy Hylton <jeremy@alum.mit.edu> parents: 20466 diff changeset	123 /* require Python string object, optional 'level' arg */
57736 919e2142726e Merged revisions 76836 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51270 diff changeset	124 if (!PyArg_ParseTuple(args, "y*\|i:compress", &pinput, &level))
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	125 return NULL;
48683 cd3b0b7fd8e1 Merged revisions 65654 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 48413 diff changeset	126 input = pinput.buf;
cd3b0b7fd8e1 Merged revisions 65654 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 48413 diff changeset	127 length = pinput.len;
19798 091c01d07d98 Patch #450702: allow threads when calling into zlib, protect usage of Martin v. Löwis <martin@v.loewis.de> parents: 16735 diff changeset	128
20469 c46e94fd6986 Reformat! Jeremy Hylton <jeremy@alum.mit.edu> parents: 20466 diff changeset	129 zst.avail_out = length + length/1000 + 12 + 1;
19798 091c01d07d98 Patch #450702: allow threads when calling into zlib, protect usage of Martin v. Löwis <martin@v.loewis.de> parents: 16735 diff changeset	130
20477 c23989e22ffa Simplify and fix error handling for most cases. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20475 diff changeset	131 output = (Byte*)malloc(zst.avail_out);
c23989e22ffa Simplify and fix error handling for most cases. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20475 diff changeset	132 if (output == NULL) {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	133 PyBuffer_Release(&pinput);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	134 PyErr_SetString(PyExc_MemoryError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	135 "Can't allocate memory to compress data");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	136 return NULL;
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	137 }
9657 7dde4501f53a patches from Andrew Jeremy Hylton <jeremy@alum.mit.edu> parents: 9652 diff changeset	138
20469 c46e94fd6986 Reformat! Jeremy Hylton <jeremy@alum.mit.edu> parents: 20466 diff changeset	139 /* Past the point of no return. From here on out, we need to make sure
c46e94fd6986 Reformat! Jeremy Hylton <jeremy@alum.mit.edu> parents: 20466 diff changeset	140 we clean up mallocs & INCREFs. */
19798 091c01d07d98 Patch #450702: allow threads when calling into zlib, protect usage of Martin v. Löwis <martin@v.loewis.de> parents: 16735 diff changeset	141
20477 c23989e22ffa Simplify and fix error handling for most cases. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20475 diff changeset	142 zst.zalloc = (alloc_func)NULL;
c23989e22ffa Simplify and fix error handling for most cases. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20475 diff changeset	143 zst.zfree = (free_func)Z_NULL;
c23989e22ffa Simplify and fix error handling for most cases. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20475 diff changeset	144 zst.next_out = (Byte *)output;
c23989e22ffa Simplify and fix error handling for most cases. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20475 diff changeset	145 zst.next_in = (Byte *)input;
c23989e22ffa Simplify and fix error handling for most cases. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20475 diff changeset	146 zst.avail_in = length;
c23989e22ffa Simplify and fix error handling for most cases. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20475 diff changeset	147 err = deflateInit(&zst, level);
19798 091c01d07d98 Patch #450702: allow threads when calling into zlib, protect usage of Martin v. Löwis <martin@v.loewis.de> parents: 16735 diff changeset	148
20477 c23989e22ffa Simplify and fix error handling for most cases. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20475 diff changeset	149 switch(err) {
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	150 case(Z_OK):
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	151 break;
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	152 case(Z_MEM_ERROR):
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	153 PyErr_SetString(PyExc_MemoryError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	154 "Out of memory while compressing data");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	155 goto error;
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	156 case(Z_STREAM_ERROR):
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	157 PyErr_SetString(ZlibError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	158 "Bad compression level");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	159 goto error;
20474 a5a30ba2899f Add zlib_error() helper. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20470 diff changeset	160 default:
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	161 deflateEnd(&zst);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	162 zlib_error(zst, err, "while compressing data");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	163 goto error;
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	164 }
19798 091c01d07d98 Patch #450702: allow threads when calling into zlib, protect usage of Martin v. Löwis <martin@v.loewis.de> parents: 16735 diff changeset	165
20477 c23989e22ffa Simplify and fix error handling for most cases. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20475 diff changeset	166 Py_BEGIN_ALLOW_THREADS;
c23989e22ffa Simplify and fix error handling for most cases. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20475 diff changeset	167 err = deflate(&zst, Z_FINISH);
c23989e22ffa Simplify and fix error handling for most cases. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20475 diff changeset	168 Py_END_ALLOW_THREADS;
19798 091c01d07d98 Patch #450702: allow threads when calling into zlib, protect usage of Martin v. Löwis <martin@v.loewis.de> parents: 16735 diff changeset	169
20477 c23989e22ffa Simplify and fix error handling for most cases. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20475 diff changeset	170 if (err != Z_STREAM_END) {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	171 zlib_error(zst, err, "while compressing data");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	172 deflateEnd(&zst);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	173 goto error;
20477 c23989e22ffa Simplify and fix error handling for most cases. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20475 diff changeset	174 }
20484 1a9494f9edb2 Trimmed trailing whitespace. Tim Peters <tim.peters@gmail.com> parents: 20483 diff changeset	175
20477 c23989e22ffa Simplify and fix error handling for most cases. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20475 diff changeset	176 err=deflateEnd(&zst);
c23989e22ffa Simplify and fix error handling for most cases. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20475 diff changeset	177 if (err == Z_OK)
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	178 ReturnVal = PyBytes_FromStringAndSize((char *)output,
41829 f7f2a49c1f2e zlib now uses bytes everywhere, and the test passes. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	179 zst.total_out);
20484 1a9494f9edb2 Trimmed trailing whitespace. Tim Peters <tim.peters@gmail.com> parents: 20483 diff changeset	180 else
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	181 zlib_error(zst, err, "while finishing compression");
19798 091c01d07d98 Patch #450702: allow threads when calling into zlib, protect usage of Martin v. Löwis <martin@v.loewis.de> parents: 16735 diff changeset	182
20477 c23989e22ffa Simplify and fix error handling for most cases. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20475 diff changeset	183 error:
48683 cd3b0b7fd8e1 Merged revisions 65654 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 48413 diff changeset	184 PyBuffer_Release(&pinput);
20469 c46e94fd6986 Reformat! Jeremy Hylton <jeremy@alum.mit.edu> parents: 20466 diff changeset	185 free(output);
19798 091c01d07d98 Patch #450702: allow threads when calling into zlib, protect usage of Martin v. Löwis <martin@v.loewis.de> parents: 16735 diff changeset	186
20469 c46e94fd6986 Reformat! Jeremy Hylton <jeremy@alum.mit.edu> parents: 20466 diff changeset	187 return ReturnVal;
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	188 }
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	189
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23295 diff changeset	190 PyDoc_STRVAR(decompress__doc__,
20485 4af8d24fa691 Simplify and regularize docstrings. Also reformat so that each docstring Tim Peters <tim.peters@gmail.com> parents: 20484 diff changeset	191 "decompress(string[, wbits[, bufsize]]) -- Return decompressed string.\n"
4af8d24fa691 Simplify and regularize docstrings. Also reformat so that each docstring Tim Peters <tim.peters@gmail.com> parents: 20484 diff changeset	192 "\n"
4af8d24fa691 Simplify and regularize docstrings. Also reformat so that each docstring Tim Peters <tim.peters@gmail.com> parents: 20484 diff changeset	193 "Optional arg wbits is the window buffer size. Optional arg bufsize is\n"
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23295 diff changeset	194 "the initial output buffer size.");
5722 6c9736865608 Doc strings (AMK). Guido van Rossum <guido@python.org> parents: 5352 diff changeset	195
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	196 static PyObject *
13496 03bc51e43f7a ANSI-fication Peter Schneider-Kamp <nowonder@nowonder.de> parents: 12576 diff changeset	197 PyZlib_decompress(PyObject self, PyObject args)
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	198 {
20469 c46e94fd6986 Reformat! Jeremy Hylton <jeremy@alum.mit.edu> parents: 20466 diff changeset	199 PyObject *result_str;
48683 cd3b0b7fd8e1 Merged revisions 65654 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 48413 diff changeset	200 Py_buffer pinput;
20469 c46e94fd6986 Reformat! Jeremy Hylton <jeremy@alum.mit.edu> parents: 20466 diff changeset	201 Byte *input;
c46e94fd6986 Reformat! Jeremy Hylton <jeremy@alum.mit.edu> parents: 20466 diff changeset	202 int length, err;
43957 23befe540d0d Merged revisions 59077-59104 via svnmerge from Guido van Rossum <guido@python.org> parents: 42750 diff changeset	203 int wsize=DEF_WBITS;
23befe540d0d Merged revisions 59077-59104 via svnmerge from Guido van Rossum <guido@python.org> parents: 42750 diff changeset	204 Py_ssize_t r_strlen=DEFAULTALLOC;
20469 c46e94fd6986 Reformat! Jeremy Hylton <jeremy@alum.mit.edu> parents: 20466 diff changeset	205 z_stream zst;
19798 091c01d07d98 Patch #450702: allow threads when calling into zlib, protect usage of Martin v. Löwis <martin@v.loewis.de> parents: 16735 diff changeset	206
57736 919e2142726e Merged revisions 76836 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51270 diff changeset	207 if (!PyArg_ParseTuple(args, "y*\|in:decompress",
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	208 &pinput, &wsize, &r_strlen))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	209 return NULL;
48683 cd3b0b7fd8e1 Merged revisions 65654 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 48413 diff changeset	210 input = pinput.buf;
cd3b0b7fd8e1 Merged revisions 65654 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 48413 diff changeset	211 length = pinput.len;
6236 6dfec320f910 Several changes: Jeremy Hylton <jeremy@alum.mit.edu> parents: 6226 diff changeset	212
20469 c46e94fd6986 Reformat! Jeremy Hylton <jeremy@alum.mit.edu> parents: 20466 diff changeset	213 if (r_strlen <= 0)
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	214 r_strlen = 1;
9657 7dde4501f53a patches from Andrew Jeremy Hylton <jeremy@alum.mit.edu> parents: 9652 diff changeset	215
20469 c46e94fd6986 Reformat! Jeremy Hylton <jeremy@alum.mit.edu> parents: 20466 diff changeset	216 zst.avail_in = length;
c46e94fd6986 Reformat! Jeremy Hylton <jeremy@alum.mit.edu> parents: 20466 diff changeset	217 zst.avail_out = r_strlen;
19798 091c01d07d98 Patch #450702: allow threads when calling into zlib, protect usage of Martin v. Löwis <martin@v.loewis.de> parents: 16735 diff changeset	218
49051 c1a8f6b648ea Fixes release blocker issue #3492 and #3790. Gregory P. Smith <greg@mad-scientist.com> parents: 48683 diff changeset	219 if (!(result_str = PyBytes_FromStringAndSize(NULL, r_strlen))) {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	220 PyBuffer_Release(&pinput);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	221 return NULL;
48683 cd3b0b7fd8e1 Merged revisions 65654 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 48413 diff changeset	222 }
19798 091c01d07d98 Patch #450702: allow threads when calling into zlib, protect usage of Martin v. Löwis <martin@v.loewis.de> parents: 16735 diff changeset	223
20469 c46e94fd6986 Reformat! Jeremy Hylton <jeremy@alum.mit.edu> parents: 20466 diff changeset	224 zst.zalloc = (alloc_func)NULL;
c46e94fd6986 Reformat! Jeremy Hylton <jeremy@alum.mit.edu> parents: 20466 diff changeset	225 zst.zfree = (free_func)Z_NULL;
49051 c1a8f6b648ea Fixes release blocker issue #3492 and #3790. Gregory P. Smith <greg@mad-scientist.com> parents: 48683 diff changeset	226 zst.next_out = (Byte *)PyBytes_AS_STRING(result_str);
20469 c46e94fd6986 Reformat! Jeremy Hylton <jeremy@alum.mit.edu> parents: 20466 diff changeset	227 zst.next_in = (Byte *)input;
c46e94fd6986 Reformat! Jeremy Hylton <jeremy@alum.mit.edu> parents: 20466 diff changeset	228 err = inflateInit2(&zst, wsize);
19798 091c01d07d98 Patch #450702: allow threads when calling into zlib, protect usage of Martin v. Löwis <martin@v.loewis.de> parents: 16735 diff changeset	229
20469 c46e94fd6986 Reformat! Jeremy Hylton <jeremy@alum.mit.edu> parents: 20466 diff changeset	230 switch(err) {
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	231 case(Z_OK):
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	232 break;
20484 1a9494f9edb2 Trimmed trailing whitespace. Tim Peters <tim.peters@gmail.com> parents: 20483 diff changeset	233 case(Z_MEM_ERROR):
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	234 PyErr_SetString(PyExc_MemoryError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	235 "Out of memory while decompressing data");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	236 goto error;
20474 a5a30ba2899f Add zlib_error() helper. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20470 diff changeset	237 default:
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	238 inflateEnd(&zst);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	239 zlib_error(zst, err, "while preparing to decompress data");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	240 goto error;
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	241 }
19798 091c01d07d98 Patch #450702: allow threads when calling into zlib, protect usage of Martin v. Löwis <martin@v.loewis.de> parents: 16735 diff changeset	242
20469 c46e94fd6986 Reformat! Jeremy Hylton <jeremy@alum.mit.edu> parents: 20466 diff changeset	243 do {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	244 Py_BEGIN_ALLOW_THREADS
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	245 err=inflate(&zst, Z_FINISH);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	246 Py_END_ALLOW_THREADS
19798 091c01d07d98 Patch #450702: allow threads when calling into zlib, protect usage of Martin v. Löwis <martin@v.loewis.de> parents: 16735 diff changeset	247
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	248 switch(err) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	249 case(Z_STREAM_END):
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	250 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	251 case(Z_BUF_ERROR):
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	252 /*
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	253 * If there is at least 1 byte of room according to zst.avail_out
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	254 * and we get this error, assume that it means zlib cannot
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	255 * process the inflate call() due to an error in the data.
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	256 */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	257 if (zst.avail_out > 0) {
61524 4b10ef8a024c Merged revisions 81100 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	258 zlib_error(zst, err, "while decompressing data");
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	259 inflateEnd(&zst);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	260 goto error;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	261 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	262 /* fall through */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	263 case(Z_OK):
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	264 /* need more memory */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	265 if (_PyBytes_Resize(&result_str, r_strlen << 1) < 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	266 inflateEnd(&zst);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	267 goto error;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	268 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	269 zst.next_out =
49051 c1a8f6b648ea Fixes release blocker issue #3492 and #3790. Gregory P. Smith <greg@mad-scientist.com> parents: 48683 diff changeset	270 (unsigned char *)PyBytes_AS_STRING(result_str) + r_strlen;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	271 zst.avail_out = r_strlen;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	272 r_strlen = r_strlen << 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	273 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	274 default:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	275 inflateEnd(&zst);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	276 zlib_error(zst, err, "while decompressing data");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	277 goto error;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	278 }
20469 c46e94fd6986 Reformat! Jeremy Hylton <jeremy@alum.mit.edu> parents: 20466 diff changeset	279 } while (err != Z_STREAM_END);
19798 091c01d07d98 Patch #450702: allow threads when calling into zlib, protect usage of Martin v. Löwis <martin@v.loewis.de> parents: 16735 diff changeset	280
20477 c23989e22ffa Simplify and fix error handling for most cases. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20475 diff changeset	281 err = inflateEnd(&zst);
c23989e22ffa Simplify and fix error handling for most cases. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20475 diff changeset	282 if (err != Z_OK) {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	283 zlib_error(zst, err, "while finishing data decompression");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	284 goto error;
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	285 }
19798 091c01d07d98 Patch #450702: allow threads when calling into zlib, protect usage of Martin v. Löwis <martin@v.loewis.de> parents: 16735 diff changeset	286
49051 c1a8f6b648ea Fixes release blocker issue #3492 and #3790. Gregory P. Smith <greg@mad-scientist.com> parents: 48683 diff changeset	287 if (_PyBytes_Resize(&result_str, zst.total_out) < 0)
41829 f7f2a49c1f2e zlib now uses bytes everywhere, and the test passes. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	288 goto error;
f7f2a49c1f2e zlib now uses bytes everywhere, and the test passes. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	289
48683 cd3b0b7fd8e1 Merged revisions 65654 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 48413 diff changeset	290 PyBuffer_Release(&pinput);
20477 c23989e22ffa Simplify and fix error handling for most cases. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20475 diff changeset	291 return result_str;
19798 091c01d07d98 Patch #450702: allow threads when calling into zlib, protect usage of Martin v. Löwis <martin@v.loewis.de> parents: 16735 diff changeset	292
20477 c23989e22ffa Simplify and fix error handling for most cases. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20475 diff changeset	293 error:
48683 cd3b0b7fd8e1 Merged revisions 65654 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 48413 diff changeset	294 PyBuffer_Release(&pinput);
20477 c23989e22ffa Simplify and fix error handling for most cases. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20475 diff changeset	295 Py_XDECREF(result_str);
c23989e22ffa Simplify and fix error handling for most cases. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20475 diff changeset	296 return NULL;
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	297 }
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	298
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	299 static PyObject *
13496 03bc51e43f7a ANSI-fication Peter Schneider-Kamp <nowonder@nowonder.de> parents: 12576 diff changeset	300 PyZlib_compressobj(PyObject selfptr, PyObject args)
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	301 {
20475 2f095c3e007d More reformatting. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20474 diff changeset	302 compobject *self;
2f095c3e007d More reformatting. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20474 diff changeset	303 int level=Z_DEFAULT_COMPRESSION, method=DEFLATED;
2f095c3e007d More reformatting. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20474 diff changeset	304 int wbits=MAX_WBITS, memLevel=DEF_MEM_LEVEL, strategy=0, err;
6007 9ba72fc4f503 Many changes. Jeremy Hylton <jeremy@alum.mit.edu> parents: 6003 diff changeset	305
20475 2f095c3e007d More reformatting. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20474 diff changeset	306 if (!PyArg_ParseTuple(args, "\|iiiii:compressobj", &level, &method, &wbits,
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	307 &memLevel, &strategy))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	308 return NULL;
6007 9ba72fc4f503 Many changes. Jeremy Hylton <jeremy@alum.mit.edu> parents: 6003 diff changeset	309
20475 2f095c3e007d More reformatting. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20474 diff changeset	310 self = newcompobject(&Comptype);
20484 1a9494f9edb2 Trimmed trailing whitespace. Tim Peters <tim.peters@gmail.com> parents: 20483 diff changeset	311 if (self==NULL)
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	312 return(NULL);
20475 2f095c3e007d More reformatting. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20474 diff changeset	313 self->zst.zalloc = (alloc_func)NULL;
2f095c3e007d More reformatting. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20474 diff changeset	314 self->zst.zfree = (free_func)Z_NULL;
34264 b2ecda4dd70f [Bug #1083110] calling .flush() on decompress objects causes a segfault due to an uninitialized pointer: fixes the problem and adds a test case Andrew M. Kuchling <amk@amk.ca> parents: 27653 diff changeset	315 self->zst.next_in = NULL;
b2ecda4dd70f [Bug #1083110] calling .flush() on decompress objects causes a segfault due to an uninitialized pointer: fixes the problem and adds a test case Andrew M. Kuchling <amk@amk.ca> parents: 27653 diff changeset	316 self->zst.avail_in = 0;
20475 2f095c3e007d More reformatting. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20474 diff changeset	317 err = deflateInit2(&self->zst, level, method, wbits, memLevel, strategy);
2f095c3e007d More reformatting. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20474 diff changeset	318 switch(err) {
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	319 case (Z_OK):
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	320 self->is_initialised = 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	321 return (PyObject*)self;
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	322 case (Z_MEM_ERROR):
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	323 Py_DECREF(self);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	324 PyErr_SetString(PyExc_MemoryError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	325 "Can't allocate memory for compression object");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	326 return NULL;
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	327 case(Z_STREAM_ERROR):
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	328 Py_DECREF(self);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	329 PyErr_SetString(PyExc_ValueError, "Invalid initialization option");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	330 return NULL;
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	331 default:
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	332 zlib_error(self->zst, err, "while creating compression object");
10028 167adf31786d Added missing DECREF's in the error branches when creating a compressor or Andrew M. Kuchling <amk@amk.ca> parents: 9995 diff changeset	333 Py_DECREF(self);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	334 return NULL;
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	335 }
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	336 }
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	337
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	338 static PyObject *
13496 03bc51e43f7a ANSI-fication Peter Schneider-Kamp <nowonder@nowonder.de> parents: 12576 diff changeset	339 PyZlib_decompressobj(PyObject selfptr, PyObject args)
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	340 {
20475 2f095c3e007d More reformatting. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20474 diff changeset	341 int wbits=DEF_WBITS, err;
2f095c3e007d More reformatting. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20474 diff changeset	342 compobject *self;
2f095c3e007d More reformatting. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20474 diff changeset	343 if (!PyArg_ParseTuple(args, "\|i:decompressobj", &wbits))
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	344 return NULL;
20475 2f095c3e007d More reformatting. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20474 diff changeset	345
2f095c3e007d More reformatting. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20474 diff changeset	346 self = newcompobject(&Decomptype);
20484 1a9494f9edb2 Trimmed trailing whitespace. Tim Peters <tim.peters@gmail.com> parents: 20483 diff changeset	347 if (self == NULL)
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	348 return(NULL);
20475 2f095c3e007d More reformatting. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20474 diff changeset	349 self->zst.zalloc = (alloc_func)NULL;
2f095c3e007d More reformatting. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20474 diff changeset	350 self->zst.zfree = (free_func)Z_NULL;
34264 b2ecda4dd70f [Bug #1083110] calling .flush() on decompress objects causes a segfault due to an uninitialized pointer: fixes the problem and adds a test case Andrew M. Kuchling <amk@amk.ca> parents: 27653 diff changeset	351 self->zst.next_in = NULL;
b2ecda4dd70f [Bug #1083110] calling .flush() on decompress objects causes a segfault due to an uninitialized pointer: fixes the problem and adds a test case Andrew M. Kuchling <amk@amk.ca> parents: 27653 diff changeset	352 self->zst.avail_in = 0;
20475 2f095c3e007d More reformatting. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20474 diff changeset	353 err = inflateInit2(&self->zst, wbits);
2f095c3e007d More reformatting. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20474 diff changeset	354 switch(err) {
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	355 case (Z_OK):
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	356 self->is_initialised = 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	357 return (PyObject*)self;
6236 6dfec320f910 Several changes: Jeremy Hylton <jeremy@alum.mit.edu> parents: 6226 diff changeset	358 case(Z_STREAM_ERROR):
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	359 Py_DECREF(self);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	360 PyErr_SetString(PyExc_ValueError, "Invalid initialization option");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	361 return NULL;
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	362 case (Z_MEM_ERROR):
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	363 Py_DECREF(self);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	364 PyErr_SetString(PyExc_MemoryError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	365 "Can't allocate memory for decompression object");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	366 return NULL;
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	367 default:
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	368 zlib_error(self->zst, err, "while creating decompression object");
10028 167adf31786d Added missing DECREF's in the error branches when creating a compressor or Andrew M. Kuchling <amk@amk.ca> parents: 9995 diff changeset	369 Py_DECREF(self);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	370 return NULL;
20475 2f095c3e007d More reformatting. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20474 diff changeset	371 }
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	372 }
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	373
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	374 static void
50453 400cfcaa8d46 Issue #4738: finer-grained locking in the zlib module. Antoine Pitrou <solipsis@pitrou.net> parents: 49051 diff changeset	375 Dealloc(compobject *self)
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	376 {
50453 400cfcaa8d46 Issue #4738: finer-grained locking in the zlib module. Antoine Pitrou <solipsis@pitrou.net> parents: 49051 diff changeset	377 #ifdef WITH_THREAD
400cfcaa8d46 Issue #4738: finer-grained locking in the zlib module. Antoine Pitrou <solipsis@pitrou.net> parents: 49051 diff changeset	378 PyThread_free_lock(self->lock);
400cfcaa8d46 Issue #4738: finer-grained locking in the zlib module. Antoine Pitrou <solipsis@pitrou.net> parents: 49051 diff changeset	379 #endif
10467 255abab3c574 Add an .unused_data attribute to decompressor objects. If .unused_data Andrew M. Kuchling <amk@amk.ca> parents: 10440 diff changeset	380 Py_XDECREF(self->unused_data);
20466 60e12f83d2d2 [ #403753 ] zlib decompress; uncontrollable memory usage Jeremy Hylton <jeremy@alum.mit.edu> parents: 20327 diff changeset	381 Py_XDECREF(self->unconsumed_tail);
12576 1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12255 diff changeset	382 PyObject_Del(self);
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	383 }
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	384
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	385 static void
50453 400cfcaa8d46 Issue #4738: finer-grained locking in the zlib module. Antoine Pitrou <solipsis@pitrou.net> parents: 49051 diff changeset	386 Comp_dealloc(compobject *self)
400cfcaa8d46 Issue #4738: finer-grained locking in the zlib module. Antoine Pitrou <solipsis@pitrou.net> parents: 49051 diff changeset	387 {
400cfcaa8d46 Issue #4738: finer-grained locking in the zlib module. Antoine Pitrou <solipsis@pitrou.net> parents: 49051 diff changeset	388 if (self->is_initialised)
400cfcaa8d46 Issue #4738: finer-grained locking in the zlib module. Antoine Pitrou <solipsis@pitrou.net> parents: 49051 diff changeset	389 deflateEnd(&self->zst);
400cfcaa8d46 Issue #4738: finer-grained locking in the zlib module. Antoine Pitrou <solipsis@pitrou.net> parents: 49051 diff changeset	390 Dealloc(self);
400cfcaa8d46 Issue #4738: finer-grained locking in the zlib module. Antoine Pitrou <solipsis@pitrou.net> parents: 49051 diff changeset	391 }
400cfcaa8d46 Issue #4738: finer-grained locking in the zlib module. Antoine Pitrou <solipsis@pitrou.net> parents: 49051 diff changeset	392
400cfcaa8d46 Issue #4738: finer-grained locking in the zlib module. Antoine Pitrou <solipsis@pitrou.net> parents: 49051 diff changeset	393 static void
13496 03bc51e43f7a ANSI-fication Peter Schneider-Kamp <nowonder@nowonder.de> parents: 12576 diff changeset	394 Decomp_dealloc(compobject *self)
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	395 {
16718 01c2470eeb2e Patch #103373 from Donovan Baarda: This patch: Andrew M. Kuchling <amk@amk.ca> parents: 16369 diff changeset	396 if (self->is_initialised)
50453 400cfcaa8d46 Issue #4738: finer-grained locking in the zlib module. Antoine Pitrou <solipsis@pitrou.net> parents: 49051 diff changeset	397 inflateEnd(&self->zst);
400cfcaa8d46 Issue #4738: finer-grained locking in the zlib module. Antoine Pitrou <solipsis@pitrou.net> parents: 49051 diff changeset	398 Dealloc(self);
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	399 }
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	400
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23295 diff changeset	401 PyDoc_STRVAR(comp_compress__doc__,
20485 4af8d24fa691 Simplify and regularize docstrings. Also reformat so that each docstring Tim Peters <tim.peters@gmail.com> parents: 20484 diff changeset	402 "compress(data) -- Return a string containing data compressed.\n"
4af8d24fa691 Simplify and regularize docstrings. Also reformat so that each docstring Tim Peters <tim.peters@gmail.com> parents: 20484 diff changeset	403 "\n"
5722 6c9736865608 Doc strings (AMK). Guido van Rossum <guido@python.org> parents: 5352 diff changeset	404 "After calling this function, some of the input data may still\n"
6c9736865608 Doc strings (AMK). Guido van Rossum <guido@python.org> parents: 5352 diff changeset	405 "be stored in internal buffers for later processing.\n"
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23295 diff changeset	406 "Call the flush() method to clear these buffers.");
5722 6c9736865608 Doc strings (AMK). Guido van Rossum <guido@python.org> parents: 5352 diff changeset	407
6c9736865608 Doc strings (AMK). Guido van Rossum <guido@python.org> parents: 5352 diff changeset	408
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	409 static PyObject *
13496 03bc51e43f7a ANSI-fication Peter Schneider-Kamp <nowonder@nowonder.de> parents: 12576 diff changeset	410 PyZlib_objcompress(compobject self, PyObject args)
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	411 {
61371 368371fa7f5c Merged revisions 80928 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57736 diff changeset	412 int err, inplen;
368371fa7f5c Merged revisions 80928 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57736 diff changeset	413 Py_ssize_t length = DEFAULTALLOC;
20469 c46e94fd6986 Reformat! Jeremy Hylton <jeremy@alum.mit.edu> parents: 20466 diff changeset	414 PyObject *RetVal;
48683 cd3b0b7fd8e1 Merged revisions 65654 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 48413 diff changeset	415 Py_buffer pinput;
20469 c46e94fd6986 Reformat! Jeremy Hylton <jeremy@alum.mit.edu> parents: 20466 diff changeset	416 Byte *input;
c46e94fd6986 Reformat! Jeremy Hylton <jeremy@alum.mit.edu> parents: 20466 diff changeset	417 unsigned long start_total_out;
20484 1a9494f9edb2 Trimmed trailing whitespace. Tim Peters <tim.peters@gmail.com> parents: 20483 diff changeset	418
57736 919e2142726e Merged revisions 76836 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51270 diff changeset	419 if (!PyArg_ParseTuple(args, "y*:compress", &pinput))
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	420 return NULL;
48683 cd3b0b7fd8e1 Merged revisions 65654 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 48413 diff changeset	421 input = pinput.buf;
cd3b0b7fd8e1 Merged revisions 65654 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 48413 diff changeset	422 inplen = pinput.len;
19798 091c01d07d98 Patch #450702: allow threads when calling into zlib, protect usage of Martin v. Löwis <martin@v.loewis.de> parents: 16735 diff changeset	423
49051 c1a8f6b648ea Fixes release blocker issue #3492 and #3790. Gregory P. Smith <greg@mad-scientist.com> parents: 48683 diff changeset	424 if (!(RetVal = PyBytes_FromStringAndSize(NULL, length))) {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	425 PyBuffer_Release(&pinput);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	426 return NULL;
48683 cd3b0b7fd8e1 Merged revisions 65654 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 48413 diff changeset	427 }
19798 091c01d07d98 Patch #450702: allow threads when calling into zlib, protect usage of Martin v. Löwis <martin@v.loewis.de> parents: 16735 diff changeset	428
50453 400cfcaa8d46 Issue #4738: finer-grained locking in the zlib module. Antoine Pitrou <solipsis@pitrou.net> parents: 49051 diff changeset	429 ENTER_ZLIB(self);
20469 c46e94fd6986 Reformat! Jeremy Hylton <jeremy@alum.mit.edu> parents: 20466 diff changeset	430
c46e94fd6986 Reformat! Jeremy Hylton <jeremy@alum.mit.edu> parents: 20466 diff changeset	431 start_total_out = self->zst.total_out;
c46e94fd6986 Reformat! Jeremy Hylton <jeremy@alum.mit.edu> parents: 20466 diff changeset	432 self->zst.avail_in = inplen;
c46e94fd6986 Reformat! Jeremy Hylton <jeremy@alum.mit.edu> parents: 20466 diff changeset	433 self->zst.next_in = input;
16718 01c2470eeb2e Patch #103373 from Donovan Baarda: This patch: Andrew M. Kuchling <amk@amk.ca> parents: 16369 diff changeset	434 self->zst.avail_out = length;
49051 c1a8f6b648ea Fixes release blocker issue #3492 and #3790. Gregory P. Smith <greg@mad-scientist.com> parents: 48683 diff changeset	435 self->zst.next_out = (unsigned char *)PyBytes_AS_STRING(RetVal);
20469 c46e94fd6986 Reformat! Jeremy Hylton <jeremy@alum.mit.edu> parents: 20466 diff changeset	436
19798 091c01d07d98 Patch #450702: allow threads when calling into zlib, protect usage of Martin v. Löwis <martin@v.loewis.de> parents: 16735 diff changeset	437 Py_BEGIN_ALLOW_THREADS
16718 01c2470eeb2e Patch #103373 from Donovan Baarda: This patch: Andrew M. Kuchling <amk@amk.ca> parents: 16369 diff changeset	438 err = deflate(&(self->zst), Z_NO_FLUSH);
19798 091c01d07d98 Patch #450702: allow threads when calling into zlib, protect usage of Martin v. Löwis <martin@v.loewis.de> parents: 16735 diff changeset	439 Py_END_ALLOW_THREADS
091c01d07d98 Patch #450702: allow threads when calling into zlib, protect usage of Martin v. Löwis <martin@v.loewis.de> parents: 16735 diff changeset	440
20469 c46e94fd6986 Reformat! Jeremy Hylton <jeremy@alum.mit.edu> parents: 20466 diff changeset	441 /* while Z_OK and the output buffer is full, there might be more output,
c46e94fd6986 Reformat! Jeremy Hylton <jeremy@alum.mit.edu> parents: 20466 diff changeset	442 so extend the output buffer and try again */
c46e94fd6986 Reformat! Jeremy Hylton <jeremy@alum.mit.edu> parents: 20466 diff changeset	443 while (err == Z_OK && self->zst.avail_out == 0) {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	444 if (_PyBytes_Resize(&RetVal, length << 1) < 0) {
41829 f7f2a49c1f2e zlib now uses bytes everywhere, and the test passes. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	445 Py_DECREF(RetVal);
f7f2a49c1f2e zlib now uses bytes everywhere, and the test passes. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	446 RetVal = NULL;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	447 goto error;
41829 f7f2a49c1f2e zlib now uses bytes everywhere, and the test passes. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	448 }
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	449 self->zst.next_out =
49051 c1a8f6b648ea Fixes release blocker issue #3492 and #3790. Gregory P. Smith <greg@mad-scientist.com> parents: 48683 diff changeset	450 (unsigned char *)PyBytes_AS_STRING(RetVal) + length;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	451 self->zst.avail_out = length;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	452 length = length << 1;
20484 1a9494f9edb2 Trimmed trailing whitespace. Tim Peters <tim.peters@gmail.com> parents: 20483 diff changeset	453
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	454 Py_BEGIN_ALLOW_THREADS
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	455 err = deflate(&(self->zst), Z_NO_FLUSH);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	456 Py_END_ALLOW_THREADS
19798 091c01d07d98 Patch #450702: allow threads when calling into zlib, protect usage of Martin v. Löwis <martin@v.loewis.de> parents: 16735 diff changeset	457 }
20484 1a9494f9edb2 Trimmed trailing whitespace. Tim Peters <tim.peters@gmail.com> parents: 20483 diff changeset	458 /* We will only get Z_BUF_ERROR if the output buffer was full but
20469 c46e94fd6986 Reformat! Jeremy Hylton <jeremy@alum.mit.edu> parents: 20466 diff changeset	459 there wasn't more output when we tried again, so it is not an error
20484 1a9494f9edb2 Trimmed trailing whitespace. Tim Peters <tim.peters@gmail.com> parents: 20483 diff changeset	460 condition.
1a9494f9edb2 Trimmed trailing whitespace. Tim Peters <tim.peters@gmail.com> parents: 20483 diff changeset	461 */
19798 091c01d07d98 Patch #450702: allow threads when calling into zlib, protect usage of Martin v. Löwis <martin@v.loewis.de> parents: 16735 diff changeset	462
20477 c23989e22ffa Simplify and fix error handling for most cases. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20475 diff changeset	463 if (err != Z_OK && err != Z_BUF_ERROR) {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	464 zlib_error(self->zst, err, "while compressing");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	465 Py_DECREF(RetVal);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	466 RetVal = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	467 goto error;
20477 c23989e22ffa Simplify and fix error handling for most cases. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20475 diff changeset	468 }
49051 c1a8f6b648ea Fixes release blocker issue #3492 and #3790. Gregory P. Smith <greg@mad-scientist.com> parents: 48683 diff changeset	469 if (_PyBytes_Resize(&RetVal, self->zst.total_out - start_total_out) < 0) {
41829 f7f2a49c1f2e zlib now uses bytes everywhere, and the test passes. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	470 Py_DECREF(RetVal);
f7f2a49c1f2e zlib now uses bytes everywhere, and the test passes. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	471 RetVal = NULL;
f7f2a49c1f2e zlib now uses bytes everywhere, and the test passes. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	472 }
19798 091c01d07d98 Patch #450702: allow threads when calling into zlib, protect usage of Martin v. Löwis <martin@v.loewis.de> parents: 16735 diff changeset	473
20477 c23989e22ffa Simplify and fix error handling for most cases. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20475 diff changeset	474 error:
50453 400cfcaa8d46 Issue #4738: finer-grained locking in the zlib module. Antoine Pitrou <solipsis@pitrou.net> parents: 49051 diff changeset	475 LEAVE_ZLIB(self);
48683 cd3b0b7fd8e1 Merged revisions 65654 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 48413 diff changeset	476 PyBuffer_Release(&pinput);
20469 c46e94fd6986 Reformat! Jeremy Hylton <jeremy@alum.mit.edu> parents: 20466 diff changeset	477 return RetVal;
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	478 }
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	479
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23295 diff changeset	480 PyDoc_STRVAR(decomp_decompress__doc__,
20485 4af8d24fa691 Simplify and regularize docstrings. Also reformat so that each docstring Tim Peters <tim.peters@gmail.com> parents: 20484 diff changeset	481 "decompress(data, max_length) -- Return a string containing the decompressed\n"
4af8d24fa691 Simplify and regularize docstrings. Also reformat so that each docstring Tim Peters <tim.peters@gmail.com> parents: 20484 diff changeset	482 "version of the data.\n"
4af8d24fa691 Simplify and regularize docstrings. Also reformat so that each docstring Tim Peters <tim.peters@gmail.com> parents: 20484 diff changeset	483 "\n"
4af8d24fa691 Simplify and regularize docstrings. Also reformat so that each docstring Tim Peters <tim.peters@gmail.com> parents: 20484 diff changeset	484 "After calling this function, some of the input data may still be stored in\n"
4af8d24fa691 Simplify and regularize docstrings. Also reformat so that each docstring Tim Peters <tim.peters@gmail.com> parents: 20484 diff changeset	485 "internal buffers for later processing.\n"
20466 60e12f83d2d2 [ #403753 ] zlib decompress; uncontrollable memory usage Jeremy Hylton <jeremy@alum.mit.edu> parents: 20327 diff changeset	486 "Call the flush() method to clear these buffers.\n"
60e12f83d2d2 [ #403753 ] zlib decompress; uncontrollable memory usage Jeremy Hylton <jeremy@alum.mit.edu> parents: 20327 diff changeset	487 "If the max_length parameter is specified then the return value will be\n"
60e12f83d2d2 [ #403753 ] zlib decompress; uncontrollable memory usage Jeremy Hylton <jeremy@alum.mit.edu> parents: 20327 diff changeset	488 "no longer than max_length. Unconsumed input data will be stored in\n"
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23295 diff changeset	489 "the unconsumed_tail attribute.");
5722 6c9736865608 Doc strings (AMK). Guido van Rossum <guido@python.org> parents: 5352 diff changeset	490
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	491 static PyObject *
13496 03bc51e43f7a ANSI-fication Peter Schneider-Kamp <nowonder@nowonder.de> parents: 12576 diff changeset	492 PyZlib_objdecompress(compobject self, PyObject args)
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	493 {
61371 368371fa7f5c Merged revisions 80928 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57736 diff changeset	494 int err, inplen, max_length = 0;
368371fa7f5c Merged revisions 80928 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57736 diff changeset	495 Py_ssize_t old_length, length = DEFAULTALLOC;
20469 c46e94fd6986 Reformat! Jeremy Hylton <jeremy@alum.mit.edu> parents: 20466 diff changeset	496 PyObject *RetVal;
48683 cd3b0b7fd8e1 Merged revisions 65654 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 48413 diff changeset	497 Py_buffer pinput;
20469 c46e94fd6986 Reformat! Jeremy Hylton <jeremy@alum.mit.edu> parents: 20466 diff changeset	498 Byte *input;
c46e94fd6986 Reformat! Jeremy Hylton <jeremy@alum.mit.edu> parents: 20466 diff changeset	499 unsigned long start_total_out;
20466 60e12f83d2d2 [ #403753 ] zlib decompress; uncontrollable memory usage Jeremy Hylton <jeremy@alum.mit.edu> parents: 20327 diff changeset	500
57736 919e2142726e Merged revisions 76836 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51270 diff changeset	501 if (!PyArg_ParseTuple(args, "y*\|i:decompress", &pinput,
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	502 &max_length))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	503 return NULL;
48683 cd3b0b7fd8e1 Merged revisions 65654 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 48413 diff changeset	504 input = pinput.buf;
cd3b0b7fd8e1 Merged revisions 65654 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 48413 diff changeset	505 inplen = pinput.len;
20469 c46e94fd6986 Reformat! Jeremy Hylton <jeremy@alum.mit.edu> parents: 20466 diff changeset	506 if (max_length < 0) {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	507 PyBuffer_Release(&pinput);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	508 PyErr_SetString(PyExc_ValueError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	509 "max_length must be greater than zero");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	510 return NULL;
20469 c46e94fd6986 Reformat! Jeremy Hylton <jeremy@alum.mit.edu> parents: 20466 diff changeset	511 }
19798 091c01d07d98 Patch #450702: allow threads when calling into zlib, protect usage of Martin v. Löwis <martin@v.loewis.de> parents: 16735 diff changeset	512
20469 c46e94fd6986 Reformat! Jeremy Hylton <jeremy@alum.mit.edu> parents: 20466 diff changeset	513 /* limit amount of data allocated to max_length */
20484 1a9494f9edb2 Trimmed trailing whitespace. Tim Peters <tim.peters@gmail.com> parents: 20483 diff changeset	514 if (max_length && length > max_length)
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	515 length = max_length;
49051 c1a8f6b648ea Fixes release blocker issue #3492 and #3790. Gregory P. Smith <greg@mad-scientist.com> parents: 48683 diff changeset	516 if (!(RetVal = PyBytes_FromStringAndSize(NULL, length))) {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	517 PyBuffer_Release(&pinput);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	518 return NULL;
48683 cd3b0b7fd8e1 Merged revisions 65654 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 48413 diff changeset	519 }
19798 091c01d07d98 Patch #450702: allow threads when calling into zlib, protect usage of Martin v. Löwis <martin@v.loewis.de> parents: 16735 diff changeset	520
50453 400cfcaa8d46 Issue #4738: finer-grained locking in the zlib module. Antoine Pitrou <solipsis@pitrou.net> parents: 49051 diff changeset	521 ENTER_ZLIB(self);
20469 c46e94fd6986 Reformat! Jeremy Hylton <jeremy@alum.mit.edu> parents: 20466 diff changeset	522
c46e94fd6986 Reformat! Jeremy Hylton <jeremy@alum.mit.edu> parents: 20466 diff changeset	523 start_total_out = self->zst.total_out;
c46e94fd6986 Reformat! Jeremy Hylton <jeremy@alum.mit.edu> parents: 20466 diff changeset	524 self->zst.avail_in = inplen;
c46e94fd6986 Reformat! Jeremy Hylton <jeremy@alum.mit.edu> parents: 20466 diff changeset	525 self->zst.next_in = input;
c46e94fd6986 Reformat! Jeremy Hylton <jeremy@alum.mit.edu> parents: 20466 diff changeset	526 self->zst.avail_out = length;
49051 c1a8f6b648ea Fixes release blocker issue #3492 and #3790. Gregory P. Smith <greg@mad-scientist.com> parents: 48683 diff changeset	527 self->zst.next_out = (unsigned char *)PyBytes_AS_STRING(RetVal);
20466 60e12f83d2d2 [ #403753 ] zlib decompress; uncontrollable memory usage Jeremy Hylton <jeremy@alum.mit.edu> parents: 20327 diff changeset	528
19798 091c01d07d98 Patch #450702: allow threads when calling into zlib, protect usage of Martin v. Löwis <martin@v.loewis.de> parents: 16735 diff changeset	529 Py_BEGIN_ALLOW_THREADS
16718 01c2470eeb2e Patch #103373 from Donovan Baarda: This patch: Andrew M. Kuchling <amk@amk.ca> parents: 16369 diff changeset	530 err = inflate(&(self->zst), Z_SYNC_FLUSH);
19798 091c01d07d98 Patch #450702: allow threads when calling into zlib, protect usage of Martin v. Löwis <martin@v.loewis.de> parents: 16735 diff changeset	531 Py_END_ALLOW_THREADS
091c01d07d98 Patch #450702: allow threads when calling into zlib, protect usage of Martin v. Löwis <martin@v.loewis.de> parents: 16735 diff changeset	532
20469 c46e94fd6986 Reformat! Jeremy Hylton <jeremy@alum.mit.edu> parents: 20466 diff changeset	533 /* While Z_OK and the output buffer is full, there might be more output.
c46e94fd6986 Reformat! Jeremy Hylton <jeremy@alum.mit.edu> parents: 20466 diff changeset	534 So extend the output buffer and try again.
c46e94fd6986 Reformat! Jeremy Hylton <jeremy@alum.mit.edu> parents: 20466 diff changeset	535 */
20484 1a9494f9edb2 Trimmed trailing whitespace. Tim Peters <tim.peters@gmail.com> parents: 20483 diff changeset	536 while (err == Z_OK && self->zst.avail_out == 0) {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	537 /* If max_length set, don't continue decompressing if we've already
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	538 reached the limit.
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	539 */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	540 if (max_length && length >= max_length)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	541 break;
20469 c46e94fd6986 Reformat! Jeremy Hylton <jeremy@alum.mit.edu> parents: 20466 diff changeset	542
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	543 /* otherwise, ... */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	544 old_length = length;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	545 length = length << 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	546 if (max_length && length > max_length)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	547 length = max_length;
20466 60e12f83d2d2 [ #403753 ] zlib decompress; uncontrollable memory usage Jeremy Hylton <jeremy@alum.mit.edu> parents: 20327 diff changeset	548
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	549 if (_PyBytes_Resize(&RetVal, length) < 0) {
41829 f7f2a49c1f2e zlib now uses bytes everywhere, and the test passes. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	550 Py_DECREF(RetVal);
f7f2a49c1f2e zlib now uses bytes everywhere, and the test passes. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	551 RetVal = NULL;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	552 goto error;
41829 f7f2a49c1f2e zlib now uses bytes everywhere, and the test passes. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	553 }
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	554 self->zst.next_out =
49051 c1a8f6b648ea Fixes release blocker issue #3492 and #3790. Gregory P. Smith <greg@mad-scientist.com> parents: 48683 diff changeset	555 (unsigned char *)PyBytes_AS_STRING(RetVal) + old_length;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	556 self->zst.avail_out = length - old_length;
20469 c46e94fd6986 Reformat! Jeremy Hylton <jeremy@alum.mit.edu> parents: 20466 diff changeset	557
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	558 Py_BEGIN_ALLOW_THREADS
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	559 err = inflate(&(self->zst), Z_SYNC_FLUSH);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	560 Py_END_ALLOW_THREADS
20469 c46e94fd6986 Reformat! Jeremy Hylton <jeremy@alum.mit.edu> parents: 20466 diff changeset	561 }
c46e94fd6986 Reformat! Jeremy Hylton <jeremy@alum.mit.edu> parents: 20466 diff changeset	562
34264 b2ecda4dd70f [Bug #1083110] calling .flush() on decompress objects causes a segfault due to an uninitialized pointer: fixes the problem and adds a test case Andrew M. Kuchling <amk@amk.ca> parents: 27653 diff changeset	563 /* Not all of the compressed data could be accommodated in the output buffer
20469 c46e94fd6986 Reformat! Jeremy Hylton <jeremy@alum.mit.edu> parents: 20466 diff changeset	564 of specified size. Return the unconsumed tail in an attribute.*/
c46e94fd6986 Reformat! Jeremy Hylton <jeremy@alum.mit.edu> parents: 20466 diff changeset	565 if(max_length) {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	566 Py_DECREF(self->unconsumed_tail);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	567 self->unconsumed_tail = PyBytes_FromStringAndSize((char *)self->zst.next_in,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	568 self->zst.avail_in);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	569 if(!self->unconsumed_tail) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	570 Py_DECREF(RetVal);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	571 RetVal = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	572 goto error;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	573 }
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	574 }
20469 c46e94fd6986 Reformat! Jeremy Hylton <jeremy@alum.mit.edu> parents: 20466 diff changeset	575
20484 1a9494f9edb2 Trimmed trailing whitespace. Tim Peters <tim.peters@gmail.com> parents: 20483 diff changeset	576 /* The end of the compressed data has been reached, so set the
1a9494f9edb2 Trimmed trailing whitespace. Tim Peters <tim.peters@gmail.com> parents: 20483 diff changeset	577 unused_data attribute to a string containing the remainder of the
1a9494f9edb2 Trimmed trailing whitespace. Tim Peters <tim.peters@gmail.com> parents: 20483 diff changeset	578 data in the string. Note that this is also a logical place to call
20469 c46e94fd6986 Reformat! Jeremy Hylton <jeremy@alum.mit.edu> parents: 20466 diff changeset	579 inflateEnd, but the old behaviour of only calling it on flush() is
c46e94fd6986 Reformat! Jeremy Hylton <jeremy@alum.mit.edu> parents: 20466 diff changeset	580 preserved.
c46e94fd6986 Reformat! Jeremy Hylton <jeremy@alum.mit.edu> parents: 20466 diff changeset	581 */
20477 c23989e22ffa Simplify and fix error handling for most cases. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20475 diff changeset	582 if (err == Z_STREAM_END) {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	583 Py_XDECREF(self->unused_data); /* Free original empty string */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	584 self->unused_data = PyBytes_FromStringAndSize(
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	585 (char *)self->zst.next_in, self->zst.avail_in);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	586 if (self->unused_data == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	587 Py_DECREF(RetVal);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	588 goto error;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	589 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	590 /* We will only get Z_BUF_ERROR if the output buffer was full
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	591 but there wasn't more output when we tried again, so it is
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	592 not an error condition.
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	593 */
20477 c23989e22ffa Simplify and fix error handling for most cases. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20475 diff changeset	594 } else if (err != Z_OK && err != Z_BUF_ERROR) {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	595 zlib_error(self->zst, err, "while decompressing");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	596 Py_DECREF(RetVal);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	597 RetVal = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	598 goto error;
19798 091c01d07d98 Patch #450702: allow threads when calling into zlib, protect usage of Martin v. Löwis <martin@v.loewis.de> parents: 16735 diff changeset	599 }
091c01d07d98 Patch #450702: allow threads when calling into zlib, protect usage of Martin v. Löwis <martin@v.loewis.de> parents: 16735 diff changeset	600
49051 c1a8f6b648ea Fixes release blocker issue #3492 and #3790. Gregory P. Smith <greg@mad-scientist.com> parents: 48683 diff changeset	601 if (_PyBytes_Resize(&RetVal, self->zst.total_out - start_total_out) < 0) {
41829 f7f2a49c1f2e zlib now uses bytes everywhere, and the test passes. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	602 Py_DECREF(RetVal);
f7f2a49c1f2e zlib now uses bytes everywhere, and the test passes. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	603 RetVal = NULL;
f7f2a49c1f2e zlib now uses bytes everywhere, and the test passes. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	604 }
19798 091c01d07d98 Patch #450702: allow threads when calling into zlib, protect usage of Martin v. Löwis <martin@v.loewis.de> parents: 16735 diff changeset	605
20477 c23989e22ffa Simplify and fix error handling for most cases. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20475 diff changeset	606 error:
50453 400cfcaa8d46 Issue #4738: finer-grained locking in the zlib module. Antoine Pitrou <solipsis@pitrou.net> parents: 49051 diff changeset	607 LEAVE_ZLIB(self);
48683 cd3b0b7fd8e1 Merged revisions 65654 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 48413 diff changeset	608 PyBuffer_Release(&pinput);
20469 c46e94fd6986 Reformat! Jeremy Hylton <jeremy@alum.mit.edu> parents: 20466 diff changeset	609 return RetVal;
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	610 }
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	611
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23295 diff changeset	612 PyDoc_STRVAR(comp_flush__doc__,
9657 7dde4501f53a patches from Andrew Jeremy Hylton <jeremy@alum.mit.edu> parents: 9652 diff changeset	613 "flush( [mode] ) -- Return a string containing any remaining compressed data.\n"
20485 4af8d24fa691 Simplify and regularize docstrings. Also reformat so that each docstring Tim Peters <tim.peters@gmail.com> parents: 20484 diff changeset	614 "\n"
4af8d24fa691 Simplify and regularize docstrings. Also reformat so that each docstring Tim Peters <tim.peters@gmail.com> parents: 20484 diff changeset	615 "mode can be one of the constants Z_SYNC_FLUSH, Z_FULL_FLUSH, Z_FINISH; the\n"
9657 7dde4501f53a patches from Andrew Jeremy Hylton <jeremy@alum.mit.edu> parents: 9652 diff changeset	616 "default value used when mode is not specified is Z_FINISH.\n"
7dde4501f53a patches from Andrew Jeremy Hylton <jeremy@alum.mit.edu> parents: 9652 diff changeset	617 "If mode == Z_FINISH, the compressor object can no longer be used after\n"
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23295 diff changeset	618 "calling the flush() method. Otherwise, more data can still be compressed.");
5722 6c9736865608 Doc strings (AMK). Guido van Rossum <guido@python.org> parents: 5352 diff changeset	619
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	620 static PyObject *
13496 03bc51e43f7a ANSI-fication Peter Schneider-Kamp <nowonder@nowonder.de> parents: 12576 diff changeset	621 PyZlib_flush(compobject self, PyObject args)
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	622 {
20469 c46e94fd6986 Reformat! Jeremy Hylton <jeremy@alum.mit.edu> parents: 20466 diff changeset	623 int err, length = DEFAULTALLOC;
c46e94fd6986 Reformat! Jeremy Hylton <jeremy@alum.mit.edu> parents: 20466 diff changeset	624 PyObject *RetVal;
c46e94fd6986 Reformat! Jeremy Hylton <jeremy@alum.mit.edu> parents: 20466 diff changeset	625 int flushmode = Z_FINISH;
c46e94fd6986 Reformat! Jeremy Hylton <jeremy@alum.mit.edu> parents: 20466 diff changeset	626 unsigned long start_total_out;
9657 7dde4501f53a patches from Andrew Jeremy Hylton <jeremy@alum.mit.edu> parents: 9652 diff changeset	627
20469 c46e94fd6986 Reformat! Jeremy Hylton <jeremy@alum.mit.edu> parents: 20466 diff changeset	628 if (!PyArg_ParseTuple(args, "\|i:flush", &flushmode))
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	629 return NULL;
9657 7dde4501f53a patches from Andrew Jeremy Hylton <jeremy@alum.mit.edu> parents: 9652 diff changeset	630
20469 c46e94fd6986 Reformat! Jeremy Hylton <jeremy@alum.mit.edu> parents: 20466 diff changeset	631 /* Flushing with Z_NO_FLUSH is a no-op, so there's no point in
c46e94fd6986 Reformat! Jeremy Hylton <jeremy@alum.mit.edu> parents: 20466 diff changeset	632 doing any work at all; just return an empty string. */
c46e94fd6986 Reformat! Jeremy Hylton <jeremy@alum.mit.edu> parents: 20466 diff changeset	633 if (flushmode == Z_NO_FLUSH) {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	634 return PyBytes_FromStringAndSize(NULL, 0);
20469 c46e94fd6986 Reformat! Jeremy Hylton <jeremy@alum.mit.edu> parents: 20466 diff changeset	635 }
19798 091c01d07d98 Patch #450702: allow threads when calling into zlib, protect usage of Martin v. Löwis <martin@v.loewis.de> parents: 16735 diff changeset	636
49051 c1a8f6b648ea Fixes release blocker issue #3492 and #3790. Gregory P. Smith <greg@mad-scientist.com> parents: 48683 diff changeset	637 if (!(RetVal = PyBytes_FromStringAndSize(NULL, length)))
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	638 return NULL;
19798 091c01d07d98 Patch #450702: allow threads when calling into zlib, protect usage of Martin v. Löwis <martin@v.loewis.de> parents: 16735 diff changeset	639
50453 400cfcaa8d46 Issue #4738: finer-grained locking in the zlib module. Antoine Pitrou <solipsis@pitrou.net> parents: 49051 diff changeset	640 ENTER_ZLIB(self);
20484 1a9494f9edb2 Trimmed trailing whitespace. Tim Peters <tim.peters@gmail.com> parents: 20483 diff changeset	641
20469 c46e94fd6986 Reformat! Jeremy Hylton <jeremy@alum.mit.edu> parents: 20466 diff changeset	642 start_total_out = self->zst.total_out;
c46e94fd6986 Reformat! Jeremy Hylton <jeremy@alum.mit.edu> parents: 20466 diff changeset	643 self->zst.avail_in = 0;
16718 01c2470eeb2e Patch #103373 from Donovan Baarda: This patch: Andrew M. Kuchling <amk@amk.ca> parents: 16369 diff changeset	644 self->zst.avail_out = length;
49051 c1a8f6b648ea Fixes release blocker issue #3492 and #3790. Gregory P. Smith <greg@mad-scientist.com> parents: 48683 diff changeset	645 self->zst.next_out = (unsigned char *)PyBytes_AS_STRING(RetVal);
19798 091c01d07d98 Patch #450702: allow threads when calling into zlib, protect usage of Martin v. Löwis <martin@v.loewis.de> parents: 16735 diff changeset	646
091c01d07d98 Patch #450702: allow threads when calling into zlib, protect usage of Martin v. Löwis <martin@v.loewis.de> parents: 16735 diff changeset	647 Py_BEGIN_ALLOW_THREADS
16718 01c2470eeb2e Patch #103373 from Donovan Baarda: This patch: Andrew M. Kuchling <amk@amk.ca> parents: 16369 diff changeset	648 err = deflate(&(self->zst), flushmode);
19798 091c01d07d98 Patch #450702: allow threads when calling into zlib, protect usage of Martin v. Löwis <martin@v.loewis.de> parents: 16735 diff changeset	649 Py_END_ALLOW_THREADS
20469 c46e94fd6986 Reformat! Jeremy Hylton <jeremy@alum.mit.edu> parents: 20466 diff changeset	650
c46e94fd6986 Reformat! Jeremy Hylton <jeremy@alum.mit.edu> parents: 20466 diff changeset	651 /* while Z_OK and the output buffer is full, there might be more output,
c46e94fd6986 Reformat! Jeremy Hylton <jeremy@alum.mit.edu> parents: 20466 diff changeset	652 so extend the output buffer and try again */
c46e94fd6986 Reformat! Jeremy Hylton <jeremy@alum.mit.edu> parents: 20466 diff changeset	653 while (err == Z_OK && self->zst.avail_out == 0) {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	654 if (_PyBytes_Resize(&RetVal, length << 1) < 0) {
41829 f7f2a49c1f2e zlib now uses bytes everywhere, and the test passes. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	655 Py_DECREF(RetVal);
f7f2a49c1f2e zlib now uses bytes everywhere, and the test passes. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	656 RetVal = NULL;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	657 goto error;
41829 f7f2a49c1f2e zlib now uses bytes everywhere, and the test passes. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	658 }
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	659 self->zst.next_out =
49051 c1a8f6b648ea Fixes release blocker issue #3492 and #3790. Gregory P. Smith <greg@mad-scientist.com> parents: 48683 diff changeset	660 (unsigned char *)PyBytes_AS_STRING(RetVal) + length;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	661 self->zst.avail_out = length;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	662 length = length << 1;
19798 091c01d07d98 Patch #450702: allow threads when calling into zlib, protect usage of Martin v. Löwis <martin@v.loewis.de> parents: 16735 diff changeset	663
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	664 Py_BEGIN_ALLOW_THREADS
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	665 err = deflate(&(self->zst), flushmode);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	666 Py_END_ALLOW_THREADS
20469 c46e94fd6986 Reformat! Jeremy Hylton <jeremy@alum.mit.edu> parents: 20466 diff changeset	667 }
19798 091c01d07d98 Patch #450702: allow threads when calling into zlib, protect usage of Martin v. Löwis <martin@v.loewis.de> parents: 16735 diff changeset	668
20469 c46e94fd6986 Reformat! Jeremy Hylton <jeremy@alum.mit.edu> parents: 20466 diff changeset	669 /* If flushmode is Z_FINISH, we also have to call deflateEnd() to free
20484 1a9494f9edb2 Trimmed trailing whitespace. Tim Peters <tim.peters@gmail.com> parents: 20483 diff changeset	670 various data structures. Note we should only get Z_STREAM_END when
20469 c46e94fd6986 Reformat! Jeremy Hylton <jeremy@alum.mit.edu> parents: 20466 diff changeset	671 flushmode is Z_FINISH, but checking both for safety*/
20477 c23989e22ffa Simplify and fix error handling for most cases. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20475 diff changeset	672 if (err == Z_STREAM_END && flushmode == Z_FINISH) {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	673 err = deflateEnd(&(self->zst));
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	674 if (err != Z_OK) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	675 zlib_error(self->zst, err, "from deflateEnd()");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	676 Py_DECREF(RetVal);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	677 RetVal = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	678 goto error;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	679 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	680 else
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	681 self->is_initialised = 0;
20484 1a9494f9edb2 Trimmed trailing whitespace. Tim Peters <tim.peters@gmail.com> parents: 20483 diff changeset	682
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	683 /* We will only get Z_BUF_ERROR if the output buffer was full
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	684 but there wasn't more output when we tried again, so it is
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	685 not an error condition.
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	686 */
20477 c23989e22ffa Simplify and fix error handling for most cases. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20475 diff changeset	687 } else if (err!=Z_OK && err!=Z_BUF_ERROR) {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	688 zlib_error(self->zst, err, "while flushing");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	689 Py_DECREF(RetVal);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	690 RetVal = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	691 goto error;
20477 c23989e22ffa Simplify and fix error handling for most cases. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20475 diff changeset	692 }
20484 1a9494f9edb2 Trimmed trailing whitespace. Tim Peters <tim.peters@gmail.com> parents: 20483 diff changeset	693
49051 c1a8f6b648ea Fixes release blocker issue #3492 and #3790. Gregory P. Smith <greg@mad-scientist.com> parents: 48683 diff changeset	694 if (_PyBytes_Resize(&RetVal, self->zst.total_out - start_total_out) < 0) {
41829 f7f2a49c1f2e zlib now uses bytes everywhere, and the test passes. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	695 Py_DECREF(RetVal);
f7f2a49c1f2e zlib now uses bytes everywhere, and the test passes. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	696 RetVal = NULL;
f7f2a49c1f2e zlib now uses bytes everywhere, and the test passes. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	697 }
20469 c46e94fd6986 Reformat! Jeremy Hylton <jeremy@alum.mit.edu> parents: 20466 diff changeset	698
20484 1a9494f9edb2 Trimmed trailing whitespace. Tim Peters <tim.peters@gmail.com> parents: 20483 diff changeset	699 error:
50453 400cfcaa8d46 Issue #4738: finer-grained locking in the zlib module. Antoine Pitrou <solipsis@pitrou.net> parents: 49051 diff changeset	700 LEAVE_ZLIB(self);
19798 091c01d07d98 Patch #450702: allow threads when calling into zlib, protect usage of Martin v. Löwis <martin@v.loewis.de> parents: 16735 diff changeset	701
20477 c23989e22ffa Simplify and fix error handling for most cases. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20475 diff changeset	702 return RetVal;
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	703 }
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	704
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	705 #ifdef HAVE_ZLIB_COPY
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	706 PyDoc_STRVAR(comp_copy__doc__,
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	707 "copy() -- Return a copy of the compression object.");
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	708
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	709 static PyObject *
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	710 PyZlib_copy(compobject *self)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	711 {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	712 compobject *retval = NULL;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	713 int err;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	714
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	715 retval = newcompobject(&Comptype);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	716 if (!retval) return NULL;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	717
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	718 /* Copy the zstream state
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	719 * We use ENTER_ZLIB / LEAVE_ZLIB to make this thread-safe
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	720 */
50453 400cfcaa8d46 Issue #4738: finer-grained locking in the zlib module. Antoine Pitrou <solipsis@pitrou.net> parents: 49051 diff changeset	721 ENTER_ZLIB(self);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	722 err = deflateCopy(&retval->zst, &self->zst);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	723 switch(err) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	724 case(Z_OK):
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	725 break;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	726 case(Z_STREAM_ERROR):
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	727 PyErr_SetString(PyExc_ValueError, "Inconsistent stream state");
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	728 goto error;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	729 case(Z_MEM_ERROR):
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	730 PyErr_SetString(PyExc_MemoryError,
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	731 "Can't allocate memory for compression object");
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	732 goto error;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	733 default:
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	734 zlib_error(self->zst, err, "while copying compression object");
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	735 goto error;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	736 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	737 Py_INCREF(self->unused_data);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	738 Py_INCREF(self->unconsumed_tail);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	739 Py_XDECREF(retval->unused_data);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	740 Py_XDECREF(retval->unconsumed_tail);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	741 retval->unused_data = self->unused_data;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	742 retval->unconsumed_tail = self->unconsumed_tail;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	743
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	744 /* Mark it as being initialized */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	745 retval->is_initialised = 1;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	746
50453 400cfcaa8d46 Issue #4738: finer-grained locking in the zlib module. Antoine Pitrou <solipsis@pitrou.net> parents: 49051 diff changeset	747 LEAVE_ZLIB(self);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	748 return (PyObject *)retval;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	749
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	750 error:
50453 400cfcaa8d46 Issue #4738: finer-grained locking in the zlib module. Antoine Pitrou <solipsis@pitrou.net> parents: 49051 diff changeset	751 LEAVE_ZLIB(self);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	752 Py_XDECREF(retval);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	753 return NULL;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	754 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	755
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	756 PyDoc_STRVAR(decomp_copy__doc__,
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	757 "copy() -- Return a copy of the decompression object.");
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	758
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	759 static PyObject *
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	760 PyZlib_uncopy(compobject *self)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	761 {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	762 compobject *retval = NULL;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	763 int err;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	764
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	765 retval = newcompobject(&Decomptype);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	766 if (!retval) return NULL;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	767
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	768 /* Copy the zstream state
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	769 * We use ENTER_ZLIB / LEAVE_ZLIB to make this thread-safe
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	770 */
50453 400cfcaa8d46 Issue #4738: finer-grained locking in the zlib module. Antoine Pitrou <solipsis@pitrou.net> parents: 49051 diff changeset	771 ENTER_ZLIB(self);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	772 err = inflateCopy(&retval->zst, &self->zst);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	773 switch(err) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	774 case(Z_OK):
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	775 break;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	776 case(Z_STREAM_ERROR):
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	777 PyErr_SetString(PyExc_ValueError, "Inconsistent stream state");
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	778 goto error;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	779 case(Z_MEM_ERROR):
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	780 PyErr_SetString(PyExc_MemoryError,
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	781 "Can't allocate memory for decompression object");
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	782 goto error;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	783 default:
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	784 zlib_error(self->zst, err, "while copying decompression object");
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	785 goto error;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	786 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	787
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	788 Py_INCREF(self->unused_data);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	789 Py_INCREF(self->unconsumed_tail);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	790 Py_XDECREF(retval->unused_data);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	791 Py_XDECREF(retval->unconsumed_tail);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	792 retval->unused_data = self->unused_data;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	793 retval->unconsumed_tail = self->unconsumed_tail;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	794
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	795 /* Mark it as being initialized */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	796 retval->is_initialised = 1;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	797
50453 400cfcaa8d46 Issue #4738: finer-grained locking in the zlib module. Antoine Pitrou <solipsis@pitrou.net> parents: 49051 diff changeset	798 LEAVE_ZLIB(self);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	799 return (PyObject *)retval;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	800
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	801 error:
50453 400cfcaa8d46 Issue #4738: finer-grained locking in the zlib module. Antoine Pitrou <solipsis@pitrou.net> parents: 49051 diff changeset	802 LEAVE_ZLIB(self);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	803 Py_XDECREF(retval);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	804 return NULL;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	805 }
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	806 #endif
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	807
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23295 diff changeset	808 PyDoc_STRVAR(decomp_flush__doc__,
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36324 diff changeset	809 "flush( [length] ) -- Return a string containing any remaining\n"
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36324 diff changeset	810 "decompressed data. length, if given, is the initial size of the\n"
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36324 diff changeset	811 "output buffer.\n"
20485 4af8d24fa691 Simplify and regularize docstrings. Also reformat so that each docstring Tim Peters <tim.peters@gmail.com> parents: 20484 diff changeset	812 "\n"
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23295 diff changeset	813 "The decompressor object can no longer be used after this call.");
5722 6c9736865608 Doc strings (AMK). Guido van Rossum <guido@python.org> parents: 5352 diff changeset	814
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	815 static PyObject *
13496 03bc51e43f7a ANSI-fication Peter Schneider-Kamp <nowonder@nowonder.de> parents: 12576 diff changeset	816 PyZlib_unflush(compobject self, PyObject args)
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	817 {
27653 106a44a4b975 - Thanks to Scott David Daniels, a subtle bug in how the zlib Guido van Rossum <guido@python.org> parents: 24363 diff changeset	818 int err, length = DEFAULTALLOC;
20477 c23989e22ffa Simplify and fix error handling for most cases. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20475 diff changeset	819 PyObject * retval = NULL;
27653 106a44a4b975 - Thanks to Scott David Daniels, a subtle bug in how the zlib Guido van Rossum <guido@python.org> parents: 24363 diff changeset	820 unsigned long start_total_out;
20484 1a9494f9edb2 Trimmed trailing whitespace. Tim Peters <tim.peters@gmail.com> parents: 20483 diff changeset	821
27653 106a44a4b975 - Thanks to Scott David Daniels, a subtle bug in how the zlib Guido van Rossum <guido@python.org> parents: 24363 diff changeset	822 if (!PyArg_ParseTuple(args, "\|i:flush", &length))
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	823 return NULL;
46370 2e917b0c8f6e Merged revisions 62194,62197-62198,62204-62205,62214,62219-62221,62227,62229-62231,62233-62235,62237-62239 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46084 diff changeset	824 if (length <= 0) {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	825 PyErr_SetString(PyExc_ValueError, "length must be greater than zero");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	826 return NULL;
46370 2e917b0c8f6e Merged revisions 62194,62197-62198,62204-62205,62214,62219-62221,62227,62229-62231,62233-62235,62237-62239 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46084 diff changeset	827 }
49051 c1a8f6b648ea Fixes release blocker issue #3492 and #3790. Gregory P. Smith <greg@mad-scientist.com> parents: 48683 diff changeset	828 if (!(retval = PyBytes_FromStringAndSize(NULL, length)))
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	829 return NULL;
27653 106a44a4b975 - Thanks to Scott David Daniels, a subtle bug in how the zlib Guido van Rossum <guido@python.org> parents: 24363 diff changeset	830
19798 091c01d07d98 Patch #450702: allow threads when calling into zlib, protect usage of Martin v. Löwis <martin@v.loewis.de> parents: 16735 diff changeset	831
50453 400cfcaa8d46 Issue #4738: finer-grained locking in the zlib module. Antoine Pitrou <solipsis@pitrou.net> parents: 49051 diff changeset	832 ENTER_ZLIB(self);
19798 091c01d07d98 Patch #450702: allow threads when calling into zlib, protect usage of Martin v. Löwis <martin@v.loewis.de> parents: 16735 diff changeset	833
27653 106a44a4b975 - Thanks to Scott David Daniels, a subtle bug in how the zlib Guido van Rossum <guido@python.org> parents: 24363 diff changeset	834 start_total_out = self->zst.total_out;
106a44a4b975 - Thanks to Scott David Daniels, a subtle bug in how the zlib Guido van Rossum <guido@python.org> parents: 24363 diff changeset	835 self->zst.avail_out = length;
49051 c1a8f6b648ea Fixes release blocker issue #3492 and #3790. Gregory P. Smith <greg@mad-scientist.com> parents: 48683 diff changeset	836 self->zst.next_out = (Byte *)PyBytes_AS_STRING(retval);
27653 106a44a4b975 - Thanks to Scott David Daniels, a subtle bug in how the zlib Guido van Rossum <guido@python.org> parents: 24363 diff changeset	837
106a44a4b975 - Thanks to Scott David Daniels, a subtle bug in how the zlib Guido van Rossum <guido@python.org> parents: 24363 diff changeset	838 Py_BEGIN_ALLOW_THREADS
106a44a4b975 - Thanks to Scott David Daniels, a subtle bug in how the zlib Guido van Rossum <guido@python.org> parents: 24363 diff changeset	839 err = inflate(&(self->zst), Z_FINISH);
106a44a4b975 - Thanks to Scott David Daniels, a subtle bug in how the zlib Guido van Rossum <guido@python.org> parents: 24363 diff changeset	840 Py_END_ALLOW_THREADS
106a44a4b975 - Thanks to Scott David Daniels, a subtle bug in how the zlib Guido van Rossum <guido@python.org> parents: 24363 diff changeset	841
106a44a4b975 - Thanks to Scott David Daniels, a subtle bug in how the zlib Guido van Rossum <guido@python.org> parents: 24363 diff changeset	842 /* while Z_OK and the output buffer is full, there might be more output,
106a44a4b975 - Thanks to Scott David Daniels, a subtle bug in how the zlib Guido van Rossum <guido@python.org> parents: 24363 diff changeset	843 so extend the output buffer and try again */
106a44a4b975 - Thanks to Scott David Daniels, a subtle bug in how the zlib Guido van Rossum <guido@python.org> parents: 24363 diff changeset	844 while ((err == Z_OK \|\| err == Z_BUF_ERROR) && self->zst.avail_out == 0) {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	845 if (_PyBytes_Resize(&retval, length << 1) < 0) {
41829 f7f2a49c1f2e zlib now uses bytes everywhere, and the test passes. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	846 Py_DECREF(retval);
f7f2a49c1f2e zlib now uses bytes everywhere, and the test passes. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	847 retval = NULL;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	848 goto error;
41829 f7f2a49c1f2e zlib now uses bytes everywhere, and the test passes. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	849 }
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	850 self->zst.next_out = (Byte *)PyBytes_AS_STRING(retval) + length;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	851 self->zst.avail_out = length;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	852 length = length << 1;
27653 106a44a4b975 - Thanks to Scott David Daniels, a subtle bug in how the zlib Guido van Rossum <guido@python.org> parents: 24363 diff changeset	853
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	854 Py_BEGIN_ALLOW_THREADS
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	855 err = inflate(&(self->zst), Z_FINISH);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	856 Py_END_ALLOW_THREADS
20469 c46e94fd6986 Reformat! Jeremy Hylton <jeremy@alum.mit.edu> parents: 20466 diff changeset	857 }
19798 091c01d07d98 Patch #450702: allow threads when calling into zlib, protect usage of Martin v. Löwis <martin@v.loewis.de> parents: 16735 diff changeset	858
27653 106a44a4b975 - Thanks to Scott David Daniels, a subtle bug in how the zlib Guido van Rossum <guido@python.org> parents: 24363 diff changeset	859 /* If flushmode is Z_FINISH, we also have to call deflateEnd() to free
106a44a4b975 - Thanks to Scott David Daniels, a subtle bug in how the zlib Guido van Rossum <guido@python.org> parents: 24363 diff changeset	860 various data structures. Note we should only get Z_STREAM_END when
106a44a4b975 - Thanks to Scott David Daniels, a subtle bug in how the zlib Guido van Rossum <guido@python.org> parents: 24363 diff changeset	861 flushmode is Z_FINISH */
106a44a4b975 - Thanks to Scott David Daniels, a subtle bug in how the zlib Guido van Rossum <guido@python.org> parents: 24363 diff changeset	862 if (err == Z_STREAM_END) {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	863 err = inflateEnd(&(self->zst));
27653 106a44a4b975 - Thanks to Scott David Daniels, a subtle bug in how the zlib Guido van Rossum <guido@python.org> parents: 24363 diff changeset	864 self->is_initialised = 0;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	865 if (err != Z_OK) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	866 zlib_error(self->zst, err, "from inflateEnd()");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	867 Py_DECREF(retval);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	868 retval = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	869 goto error;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	870 }
27653 106a44a4b975 - Thanks to Scott David Daniels, a subtle bug in how the zlib Guido van Rossum <guido@python.org> parents: 24363 diff changeset	871 }
49051 c1a8f6b648ea Fixes release blocker issue #3492 and #3790. Gregory P. Smith <greg@mad-scientist.com> parents: 48683 diff changeset	872 if (_PyBytes_Resize(&retval, self->zst.total_out - start_total_out) < 0) {
41829 f7f2a49c1f2e zlib now uses bytes everywhere, and the test passes. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	873 Py_DECREF(retval);
f7f2a49c1f2e zlib now uses bytes everywhere, and the test passes. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	874 retval = NULL;
f7f2a49c1f2e zlib now uses bytes everywhere, and the test passes. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	875 }
27653 106a44a4b975 - Thanks to Scott David Daniels, a subtle bug in how the zlib Guido van Rossum <guido@python.org> parents: 24363 diff changeset	876
106a44a4b975 - Thanks to Scott David Daniels, a subtle bug in how the zlib Guido van Rossum <guido@python.org> parents: 24363 diff changeset	877 error:
106a44a4b975 - Thanks to Scott David Daniels, a subtle bug in how the zlib Guido van Rossum <guido@python.org> parents: 24363 diff changeset	878
50453 400cfcaa8d46 Issue #4738: finer-grained locking in the zlib module. Antoine Pitrou <solipsis@pitrou.net> parents: 49051 diff changeset	879 LEAVE_ZLIB(self);
19798 091c01d07d98 Patch #450702: allow threads when calling into zlib, protect usage of Martin v. Löwis <martin@v.loewis.de> parents: 16735 diff changeset	880
20469 c46e94fd6986 Reformat! Jeremy Hylton <jeremy@alum.mit.edu> parents: 20466 diff changeset	881 return retval;
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	882 }
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	883
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	884 static PyMethodDef comp_methods[] =
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	885 {
20484 1a9494f9edb2 Trimmed trailing whitespace. Tim Peters <tim.peters@gmail.com> parents: 20483 diff changeset	886 {"compress", (binaryfunc)PyZlib_objcompress, METH_VARARGS,
20469 c46e94fd6986 Reformat! Jeremy Hylton <jeremy@alum.mit.edu> parents: 20466 diff changeset	887 comp_compress__doc__},
20484 1a9494f9edb2 Trimmed trailing whitespace. Tim Peters <tim.peters@gmail.com> parents: 20483 diff changeset	888 {"flush", (binaryfunc)PyZlib_flush, METH_VARARGS,
20469 c46e94fd6986 Reformat! Jeremy Hylton <jeremy@alum.mit.edu> parents: 20466 diff changeset	889 comp_flush__doc__},
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	890 #ifdef HAVE_ZLIB_COPY
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	891 {"copy", (PyCFunction)PyZlib_copy, METH_NOARGS,
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	892 comp_copy__doc__},
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	893 #endif
20469 c46e94fd6986 Reformat! Jeremy Hylton <jeremy@alum.mit.edu> parents: 20466 diff changeset	894 {NULL, NULL}
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	895 };
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	896
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	897 static PyMethodDef Decomp_methods[] =
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	898 {
20484 1a9494f9edb2 Trimmed trailing whitespace. Tim Peters <tim.peters@gmail.com> parents: 20483 diff changeset	899 {"decompress", (binaryfunc)PyZlib_objdecompress, METH_VARARGS,
20469 c46e94fd6986 Reformat! Jeremy Hylton <jeremy@alum.mit.edu> parents: 20466 diff changeset	900 decomp_decompress__doc__},
20484 1a9494f9edb2 Trimmed trailing whitespace. Tim Peters <tim.peters@gmail.com> parents: 20483 diff changeset	901 {"flush", (binaryfunc)PyZlib_unflush, METH_VARARGS,
20469 c46e94fd6986 Reformat! Jeremy Hylton <jeremy@alum.mit.edu> parents: 20466 diff changeset	902 decomp_flush__doc__},
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	903 #ifdef HAVE_ZLIB_COPY
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	904 {"copy", (PyCFunction)PyZlib_uncopy, METH_NOARGS,
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	905 decomp_copy__doc__},
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	906 #endif
20469 c46e94fd6986 Reformat! Jeremy Hylton <jeremy@alum.mit.edu> parents: 20466 diff changeset	907 {NULL, NULL}
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	908 };
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	909
48413 7e56016a6565 #3247 Get rid of Py_FindMethod; use tp_members instead. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47580 diff changeset	910 #define COMP_OFF(x) offsetof(compobject, x)
7e56016a6565 #3247 Get rid of Py_FindMethod; use tp_members instead. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47580 diff changeset	911 static PyMemberDef Decomp_members[] = {
7e56016a6565 #3247 Get rid of Py_FindMethod; use tp_members instead. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47580 diff changeset	912 {"unused_data", T_OBJECT, COMP_OFF(unused_data), READONLY},
7e56016a6565 #3247 Get rid of Py_FindMethod; use tp_members instead. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47580 diff changeset	913 {"unconsumed_tail", T_OBJECT, COMP_OFF(unconsumed_tail), READONLY},
7e56016a6565 #3247 Get rid of Py_FindMethod; use tp_members instead. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47580 diff changeset	914 {NULL},
7e56016a6565 #3247 Get rid of Py_FindMethod; use tp_members instead. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47580 diff changeset	915 };
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	916
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23295 diff changeset	917 PyDoc_STRVAR(adler32__doc__,
20485 4af8d24fa691 Simplify and regularize docstrings. Also reformat so that each docstring Tim Peters <tim.peters@gmail.com> parents: 20484 diff changeset	918 "adler32(string[, start]) -- Compute an Adler-32 checksum of string.\n"
4af8d24fa691 Simplify and regularize docstrings. Also reformat so that each docstring Tim Peters <tim.peters@gmail.com> parents: 20484 diff changeset	919 "\n"
4af8d24fa691 Simplify and regularize docstrings. Also reformat so that each docstring Tim Peters <tim.peters@gmail.com> parents: 20484 diff changeset	920 "An optional starting value can be specified. The returned checksum is\n"
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23295 diff changeset	921 "an integer.");
5722 6c9736865608 Doc strings (AMK). Guido van Rossum <guido@python.org> parents: 5352 diff changeset	922
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	923 static PyObject *
13496 03bc51e43f7a ANSI-fication Peter Schneider-Kamp <nowonder@nowonder.de> parents: 12576 diff changeset	924 PyZlib_adler32(PyObject self, PyObject args)
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	925 {
46084 6bea2f1351b1 Merged revisions 61834,61841-61842,61851-61853,61863-61864,61869-61870,61874,61889 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46042 diff changeset	926 unsigned int adler32val = 1; /* adler32(0L, Z_NULL, 0) */
50453 400cfcaa8d46 Issue #4738: finer-grained locking in the zlib module. Antoine Pitrou <solipsis@pitrou.net> parents: 49051 diff changeset	927 Py_buffer pbuf;
20484 1a9494f9edb2 Trimmed trailing whitespace. Tim Peters <tim.peters@gmail.com> parents: 20483 diff changeset	928
57736 919e2142726e Merged revisions 76836 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51270 diff changeset	929 if (!PyArg_ParseTuple(args, "y*\|I:adler32", &pbuf, &adler32val))
919e2142726e Merged revisions 76836 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51270 diff changeset	930 return NULL;
50453 400cfcaa8d46 Issue #4738: finer-grained locking in the zlib module. Antoine Pitrou <solipsis@pitrou.net> parents: 49051 diff changeset	931 /* Releasing the GIL for very small buffers is inefficient
400cfcaa8d46 Issue #4738: finer-grained locking in the zlib module. Antoine Pitrou <solipsis@pitrou.net> parents: 49051 diff changeset	932 and may lower performance */
400cfcaa8d46 Issue #4738: finer-grained locking in the zlib module. Antoine Pitrou <solipsis@pitrou.net> parents: 49051 diff changeset	933 if (pbuf.len > 1024*5) {
400cfcaa8d46 Issue #4738: finer-grained locking in the zlib module. Antoine Pitrou <solipsis@pitrou.net> parents: 49051 diff changeset	934 Py_BEGIN_ALLOW_THREADS
400cfcaa8d46 Issue #4738: finer-grained locking in the zlib module. Antoine Pitrou <solipsis@pitrou.net> parents: 49051 diff changeset	935 adler32val = adler32(adler32val, pbuf.buf, pbuf.len);
400cfcaa8d46 Issue #4738: finer-grained locking in the zlib module. Antoine Pitrou <solipsis@pitrou.net> parents: 49051 diff changeset	936 Py_END_ALLOW_THREADS
400cfcaa8d46 Issue #4738: finer-grained locking in the zlib module. Antoine Pitrou <solipsis@pitrou.net> parents: 49051 diff changeset	937 } else {
57736 919e2142726e Merged revisions 76836 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51270 diff changeset	938 adler32val = adler32(adler32val, pbuf.buf, pbuf.len);
50453 400cfcaa8d46 Issue #4738: finer-grained locking in the zlib module. Antoine Pitrou <solipsis@pitrou.net> parents: 49051 diff changeset	939 }
400cfcaa8d46 Issue #4738: finer-grained locking in the zlib module. Antoine Pitrou <solipsis@pitrou.net> parents: 49051 diff changeset	940 PyBuffer_Release(&pbuf);
45951 132cf3a79126 crc32 always returns unsigned. cleanup the code a bit and revert r61648 with Gregory P. Smith <greg@mad-scientist.com> parents: 45935 diff changeset	941 return PyLong_FromUnsignedLong(adler32val & 0xffffffffU);
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	942 }
20484 1a9494f9edb2 Trimmed trailing whitespace. Tim Peters <tim.peters@gmail.com> parents: 20483 diff changeset	943
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23295 diff changeset	944 PyDoc_STRVAR(crc32__doc__,
20485 4af8d24fa691 Simplify and regularize docstrings. Also reformat so that each docstring Tim Peters <tim.peters@gmail.com> parents: 20484 diff changeset	945 "crc32(string[, start]) -- Compute a CRC-32 checksum of string.\n"
4af8d24fa691 Simplify and regularize docstrings. Also reformat so that each docstring Tim Peters <tim.peters@gmail.com> parents: 20484 diff changeset	946 "\n"
4af8d24fa691 Simplify and regularize docstrings. Also reformat so that each docstring Tim Peters <tim.peters@gmail.com> parents: 20484 diff changeset	947 "An optional starting value can be specified. The returned checksum is\n"
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23295 diff changeset	948 "an integer.");
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	949
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	950 static PyObject *
13496 03bc51e43f7a ANSI-fication Peter Schneider-Kamp <nowonder@nowonder.de> parents: 12576 diff changeset	951 PyZlib_crc32(PyObject self, PyObject args)
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	952 {
46084 6bea2f1351b1 Merged revisions 61834,61841-61842,61851-61853,61863-61864,61869-61870,61874,61889 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46042 diff changeset	953 unsigned int crc32val = 0; /* crc32(0L, Z_NULL, 0) */
48683 cd3b0b7fd8e1 Merged revisions 65654 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 48413 diff changeset	954 Py_buffer pbuf;
cd3b0b7fd8e1 Merged revisions 65654 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 48413 diff changeset	955 int signed_val;
46084 6bea2f1351b1 Merged revisions 61834,61841-61842,61851-61853,61863-61864,61869-61870,61874,61889 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46042 diff changeset	956
57736 919e2142726e Merged revisions 76836 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51270 diff changeset	957 if (!PyArg_ParseTuple(args, "y*\|I:crc32", &pbuf, &crc32val))
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	958 return NULL;
50453 400cfcaa8d46 Issue #4738: finer-grained locking in the zlib module. Antoine Pitrou <solipsis@pitrou.net> parents: 49051 diff changeset	959 /* Releasing the GIL for very small buffers is inefficient
400cfcaa8d46 Issue #4738: finer-grained locking in the zlib module. Antoine Pitrou <solipsis@pitrou.net> parents: 49051 diff changeset	960 and may lower performance */
400cfcaa8d46 Issue #4738: finer-grained locking in the zlib module. Antoine Pitrou <solipsis@pitrou.net> parents: 49051 diff changeset	961 if (pbuf.len > 1024*5) {
400cfcaa8d46 Issue #4738: finer-grained locking in the zlib module. Antoine Pitrou <solipsis@pitrou.net> parents: 49051 diff changeset	962 Py_BEGIN_ALLOW_THREADS
400cfcaa8d46 Issue #4738: finer-grained locking in the zlib module. Antoine Pitrou <solipsis@pitrou.net> parents: 49051 diff changeset	963 signed_val = crc32(crc32val, pbuf.buf, pbuf.len);
400cfcaa8d46 Issue #4738: finer-grained locking in the zlib module. Antoine Pitrou <solipsis@pitrou.net> parents: 49051 diff changeset	964 Py_END_ALLOW_THREADS
400cfcaa8d46 Issue #4738: finer-grained locking in the zlib module. Antoine Pitrou <solipsis@pitrou.net> parents: 49051 diff changeset	965 } else {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	966 signed_val = crc32(crc32val, pbuf.buf, pbuf.len);
50453 400cfcaa8d46 Issue #4738: finer-grained locking in the zlib module. Antoine Pitrou <solipsis@pitrou.net> parents: 49051 diff changeset	967 }
48683 cd3b0b7fd8e1 Merged revisions 65654 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 48413 diff changeset	968 PyBuffer_Release(&pbuf);
46084 6bea2f1351b1 Merged revisions 61834,61841-61842,61851-61853,61863-61864,61869-61870,61874,61889 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46042 diff changeset	969 return PyLong_FromUnsignedLong(signed_val & 0xffffffffU);
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	970 }
20484 1a9494f9edb2 Trimmed trailing whitespace. Tim Peters <tim.peters@gmail.com> parents: 20483 diff changeset	971
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	972
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	973 static PyMethodDef zlib_methods[] =
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	974 {
20484 1a9494f9edb2 Trimmed trailing whitespace. Tim Peters <tim.peters@gmail.com> parents: 20483 diff changeset	975 {"adler32", (PyCFunction)PyZlib_adler32, METH_VARARGS,
20469 c46e94fd6986 Reformat! Jeremy Hylton <jeremy@alum.mit.edu> parents: 20466 diff changeset	976 adler32__doc__},
20484 1a9494f9edb2 Trimmed trailing whitespace. Tim Peters <tim.peters@gmail.com> parents: 20483 diff changeset	977 {"compress", (PyCFunction)PyZlib_compress, METH_VARARGS,
20469 c46e94fd6986 Reformat! Jeremy Hylton <jeremy@alum.mit.edu> parents: 20466 diff changeset	978 compress__doc__},
20484 1a9494f9edb2 Trimmed trailing whitespace. Tim Peters <tim.peters@gmail.com> parents: 20483 diff changeset	979 {"compressobj", (PyCFunction)PyZlib_compressobj, METH_VARARGS,
20469 c46e94fd6986 Reformat! Jeremy Hylton <jeremy@alum.mit.edu> parents: 20466 diff changeset	980 compressobj__doc__},
20484 1a9494f9edb2 Trimmed trailing whitespace. Tim Peters <tim.peters@gmail.com> parents: 20483 diff changeset	981 {"crc32", (PyCFunction)PyZlib_crc32, METH_VARARGS,
1a9494f9edb2 Trimmed trailing whitespace. Tim Peters <tim.peters@gmail.com> parents: 20483 diff changeset	982 crc32__doc__},
1a9494f9edb2 Trimmed trailing whitespace. Tim Peters <tim.peters@gmail.com> parents: 20483 diff changeset	983 {"decompress", (PyCFunction)PyZlib_decompress, METH_VARARGS,
20469 c46e94fd6986 Reformat! Jeremy Hylton <jeremy@alum.mit.edu> parents: 20466 diff changeset	984 decompress__doc__},
20484 1a9494f9edb2 Trimmed trailing whitespace. Tim Peters <tim.peters@gmail.com> parents: 20483 diff changeset	985 {"decompressobj", (PyCFunction)PyZlib_decompressobj, METH_VARARGS,
20469 c46e94fd6986 Reformat! Jeremy Hylton <jeremy@alum.mit.edu> parents: 20466 diff changeset	986 decompressobj__doc__},
c46e94fd6986 Reformat! Jeremy Hylton <jeremy@alum.mit.edu> parents: 20466 diff changeset	987 {NULL, NULL}
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	988 };
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	989
24283 c0a67a1cab09 Removed more stray instances of statichere, but left _sre.c alone. Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	990 static PyTypeObject Comptype = {
42334 e70cdce0e8b2 Merged revisions 56467-56482 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 41829 diff changeset	991 PyVarObject_HEAD_INIT(0, 0)
21313 91dd223829c6 Patch supplied by Burton Radons for his own SF bug #487390: Modifying Guido van Rossum <guido@python.org> parents: 20644 diff changeset	992 "zlib.Compress",
20469 c46e94fd6986 Reformat! Jeremy Hylton <jeremy@alum.mit.edu> parents: 20466 diff changeset	993 sizeof(compobject),
c46e94fd6986 Reformat! Jeremy Hylton <jeremy@alum.mit.edu> parents: 20466 diff changeset	994 0,
c46e94fd6986 Reformat! Jeremy Hylton <jeremy@alum.mit.edu> parents: 20466 diff changeset	995 (destructor)Comp_dealloc, /tp_dealloc/
c46e94fd6986 Reformat! Jeremy Hylton <jeremy@alum.mit.edu> parents: 20466 diff changeset	996 0, /tp_print/
48413 7e56016a6565 #3247 Get rid of Py_FindMethod; use tp_members instead. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47580 diff changeset	997 0, /tp_getattr/
20469 c46e94fd6986 Reformat! Jeremy Hylton <jeremy@alum.mit.edu> parents: 20466 diff changeset	998 0, /tp_setattr/
51270 debd14c489b9 Issue #1717: rename tp_compare to tp_reserved. I'll change the Mark Dickinson <dickinsm@gmail.com> parents: 50453 diff changeset	999 0, /tp_reserved/
20469 c46e94fd6986 Reformat! Jeremy Hylton <jeremy@alum.mit.edu> parents: 20466 diff changeset	1000 0, /tp_repr/
c46e94fd6986 Reformat! Jeremy Hylton <jeremy@alum.mit.edu> parents: 20466 diff changeset	1001 0, /tp_as_number/
c46e94fd6986 Reformat! Jeremy Hylton <jeremy@alum.mit.edu> parents: 20466 diff changeset	1002 0, /tp_as_sequence/
c46e94fd6986 Reformat! Jeremy Hylton <jeremy@alum.mit.edu> parents: 20466 diff changeset	1003 0, /tp_as_mapping/
48413 7e56016a6565 #3247 Get rid of Py_FindMethod; use tp_members instead. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47580 diff changeset	1004 0, /tp_hash/
7e56016a6565 #3247 Get rid of Py_FindMethod; use tp_members instead. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47580 diff changeset	1005 0, /tp_call/
7e56016a6565 #3247 Get rid of Py_FindMethod; use tp_members instead. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47580 diff changeset	1006 0, /tp_str/
7e56016a6565 #3247 Get rid of Py_FindMethod; use tp_members instead. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47580 diff changeset	1007 0, /tp_getattro/
7e56016a6565 #3247 Get rid of Py_FindMethod; use tp_members instead. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47580 diff changeset	1008 0, /tp_setattro/
7e56016a6565 #3247 Get rid of Py_FindMethod; use tp_members instead. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47580 diff changeset	1009 0, /tp_as_buffer/
7e56016a6565 #3247 Get rid of Py_FindMethod; use tp_members instead. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47580 diff changeset	1010 Py_TPFLAGS_DEFAULT, /tp_flags/
7e56016a6565 #3247 Get rid of Py_FindMethod; use tp_members instead. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47580 diff changeset	1011 0, /tp_doc/
7e56016a6565 #3247 Get rid of Py_FindMethod; use tp_members instead. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47580 diff changeset	1012 0, /tp_traverse/
7e56016a6565 #3247 Get rid of Py_FindMethod; use tp_members instead. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47580 diff changeset	1013 0, /tp_clear/
7e56016a6565 #3247 Get rid of Py_FindMethod; use tp_members instead. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47580 diff changeset	1014 0, /tp_richcompare/
7e56016a6565 #3247 Get rid of Py_FindMethod; use tp_members instead. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47580 diff changeset	1015 0, /tp_weaklistoffset/
7e56016a6565 #3247 Get rid of Py_FindMethod; use tp_members instead. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47580 diff changeset	1016 0, /tp_iter/
7e56016a6565 #3247 Get rid of Py_FindMethod; use tp_members instead. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47580 diff changeset	1017 0, /tp_iternext/
7e56016a6565 #3247 Get rid of Py_FindMethod; use tp_members instead. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47580 diff changeset	1018 comp_methods, /tp_methods/
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	1019 };
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	1020
24283 c0a67a1cab09 Removed more stray instances of statichere, but left _sre.c alone. Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	1021 static PyTypeObject Decomptype = {
42334 e70cdce0e8b2 Merged revisions 56467-56482 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 41829 diff changeset	1022 PyVarObject_HEAD_INIT(0, 0)
21313 91dd223829c6 Patch supplied by Burton Radons for his own SF bug #487390: Modifying Guido van Rossum <guido@python.org> parents: 20644 diff changeset	1023 "zlib.Decompress",
20469 c46e94fd6986 Reformat! Jeremy Hylton <jeremy@alum.mit.edu> parents: 20466 diff changeset	1024 sizeof(compobject),
c46e94fd6986 Reformat! Jeremy Hylton <jeremy@alum.mit.edu> parents: 20466 diff changeset	1025 0,
c46e94fd6986 Reformat! Jeremy Hylton <jeremy@alum.mit.edu> parents: 20466 diff changeset	1026 (destructor)Decomp_dealloc, /tp_dealloc/
c46e94fd6986 Reformat! Jeremy Hylton <jeremy@alum.mit.edu> parents: 20466 diff changeset	1027 0, /tp_print/
48413 7e56016a6565 #3247 Get rid of Py_FindMethod; use tp_members instead. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47580 diff changeset	1028 0, /tp_getattr/
20469 c46e94fd6986 Reformat! Jeremy Hylton <jeremy@alum.mit.edu> parents: 20466 diff changeset	1029 0, /tp_setattr/
51270 debd14c489b9 Issue #1717: rename tp_compare to tp_reserved. I'll change the Mark Dickinson <dickinsm@gmail.com> parents: 50453 diff changeset	1030 0, /tp_reserved/
20469 c46e94fd6986 Reformat! Jeremy Hylton <jeremy@alum.mit.edu> parents: 20466 diff changeset	1031 0, /tp_repr/
c46e94fd6986 Reformat! Jeremy Hylton <jeremy@alum.mit.edu> parents: 20466 diff changeset	1032 0, /tp_as_number/
c46e94fd6986 Reformat! Jeremy Hylton <jeremy@alum.mit.edu> parents: 20466 diff changeset	1033 0, /tp_as_sequence/
c46e94fd6986 Reformat! Jeremy Hylton <jeremy@alum.mit.edu> parents: 20466 diff changeset	1034 0, /tp_as_mapping/
48413 7e56016a6565 #3247 Get rid of Py_FindMethod; use tp_members instead. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47580 diff changeset	1035 0, /tp_hash/
7e56016a6565 #3247 Get rid of Py_FindMethod; use tp_members instead. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47580 diff changeset	1036 0, /tp_call/
7e56016a6565 #3247 Get rid of Py_FindMethod; use tp_members instead. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47580 diff changeset	1037 0, /tp_str/
7e56016a6565 #3247 Get rid of Py_FindMethod; use tp_members instead. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47580 diff changeset	1038 0, /tp_getattro/
7e56016a6565 #3247 Get rid of Py_FindMethod; use tp_members instead. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47580 diff changeset	1039 0, /tp_setattro/
7e56016a6565 #3247 Get rid of Py_FindMethod; use tp_members instead. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47580 diff changeset	1040 0, /tp_as_buffer/
7e56016a6565 #3247 Get rid of Py_FindMethod; use tp_members instead. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47580 diff changeset	1041 Py_TPFLAGS_DEFAULT, /tp_flags/
7e56016a6565 #3247 Get rid of Py_FindMethod; use tp_members instead. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47580 diff changeset	1042 0, /tp_doc/
7e56016a6565 #3247 Get rid of Py_FindMethod; use tp_members instead. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47580 diff changeset	1043 0, /tp_traverse/
7e56016a6565 #3247 Get rid of Py_FindMethod; use tp_members instead. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47580 diff changeset	1044 0, /tp_clear/
7e56016a6565 #3247 Get rid of Py_FindMethod; use tp_members instead. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47580 diff changeset	1045 0, /tp_richcompare/
7e56016a6565 #3247 Get rid of Py_FindMethod; use tp_members instead. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47580 diff changeset	1046 0, /tp_weaklistoffset/
7e56016a6565 #3247 Get rid of Py_FindMethod; use tp_members instead. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47580 diff changeset	1047 0, /tp_iter/
7e56016a6565 #3247 Get rid of Py_FindMethod; use tp_members instead. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47580 diff changeset	1048 0, /tp_iternext/
7e56016a6565 #3247 Get rid of Py_FindMethod; use tp_members instead. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47580 diff changeset	1049 Decomp_methods, /tp_methods/
7e56016a6565 #3247 Get rid of Py_FindMethod; use tp_members instead. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47580 diff changeset	1050 Decomp_members, /tp_members/
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	1051 };
d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	1052
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23295 diff changeset	1053 PyDoc_STRVAR(zlib_module_documentation,
20485 4af8d24fa691 Simplify and regularize docstrings. Also reformat so that each docstring Tim Peters <tim.peters@gmail.com> parents: 20484 diff changeset	1054 "The functions in this module allow compression and decompression using the\n"
4af8d24fa691 Simplify and regularize docstrings. Also reformat so that each docstring Tim Peters <tim.peters@gmail.com> parents: 20484 diff changeset	1055 "zlib library, which is based on GNU zip.\n"
4af8d24fa691 Simplify and regularize docstrings. Also reformat so that each docstring Tim Peters <tim.peters@gmail.com> parents: 20484 diff changeset	1056 "\n"
4af8d24fa691 Simplify and regularize docstrings. Also reformat so that each docstring Tim Peters <tim.peters@gmail.com> parents: 20484 diff changeset	1057 "adler32(string[, start]) -- Compute an Adler-32 checksum.\n"
4af8d24fa691 Simplify and regularize docstrings. Also reformat so that each docstring Tim Peters <tim.peters@gmail.com> parents: 20484 diff changeset	1058 "compress(string[, level]) -- Compress string, with compression level in 1-9.\n"
5722 6c9736865608 Doc strings (AMK). Guido van Rossum <guido@python.org> parents: 5352 diff changeset	1059 "compressobj([level]) -- Return a compressor object.\n"
20485 4af8d24fa691 Simplify and regularize docstrings. Also reformat so that each docstring Tim Peters <tim.peters@gmail.com> parents: 20484 diff changeset	1060 "crc32(string[, start]) -- Compute a CRC-32 checksum.\n"
11607 69216c11a1bd Fix typo in docstring: wbites -> wbits Andrew M. Kuchling <amk@amk.ca> parents: 10571 diff changeset	1061 "decompress(string,[wbits],[bufsize]) -- Decompresses a compressed string.\n"
20485 4af8d24fa691 Simplify and regularize docstrings. Also reformat so that each docstring Tim Peters <tim.peters@gmail.com> parents: 20484 diff changeset	1062 "decompressobj([wbits]) -- Return a decompressor object.\n"
4af8d24fa691 Simplify and regularize docstrings. Also reformat so that each docstring Tim Peters <tim.peters@gmail.com> parents: 20484 diff changeset	1063 "\n"
4af8d24fa691 Simplify and regularize docstrings. Also reformat so that each docstring Tim Peters <tim.peters@gmail.com> parents: 20484 diff changeset	1064 "'wbits' is window buffer size.\n"
4af8d24fa691 Simplify and regularize docstrings. Also reformat so that each docstring Tim Peters <tim.peters@gmail.com> parents: 20484 diff changeset	1065 "Compressor objects support compress() and flush() methods; decompressor\n"
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23295 diff changeset	1066 "objects support decompress() and flush().");
5722 6c9736865608 Doc strings (AMK). Guido van Rossum <guido@python.org> parents: 5352 diff changeset	1067
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47300 diff changeset	1068 static struct PyModuleDef zlibmodule = {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	1069 PyModuleDef_HEAD_INIT,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	1070 "zlib",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	1071 zlib_module_documentation,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	1072 -1,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	1073 zlib_methods,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	1074 NULL,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	1075 NULL,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	1076 NULL,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	1077 NULL
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47300 diff changeset	1078 };
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47300 diff changeset	1079
24363 979ff5d0ae07 Replace DL_IMPORT with PyMODINIT_FUNC and remove "/export:init..." link Mark Hammond <mhammond@skippinet.com.au> parents: 24283 diff changeset	1080 PyMODINIT_FUNC
13651 8a063423e0b7 Bunch of minor ANSIfications: 'void initfunc()' -> 'void initfunc(void)', Thomas Wouters <thomas@python.org> parents: 13496 diff changeset	1081 PyInit_zlib(void)
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	1082 {
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22217 diff changeset	1083 PyObject m, ver;
48413 7e56016a6565 #3247 Get rid of Py_FindMethod; use tp_members instead. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47580 diff changeset	1084 if (PyType_Ready(&Comptype) < 0)
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	1085 return NULL;
48413 7e56016a6565 #3247 Get rid of Py_FindMethod; use tp_members instead. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47580 diff changeset	1086 if (PyType_Ready(&Decomptype) < 0)
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	1087 return NULL;
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47300 diff changeset	1088 m = PyModule_Create(&zlibmodule);
36324 1af7f719ed28 Check return result from Py_InitModule(). This API can fail. Neal Norwitz <nnorwitz@gmail.com>* parents: 35914 diff changeset	1089 if (m == NULL)
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	1090 return NULL;
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22217 diff changeset	1091
20469 c46e94fd6986 Reformat! Jeremy Hylton <jeremy@alum.mit.edu> parents: 20466 diff changeset	1092 ZlibError = PyErr_NewException("zlib.error", NULL, NULL);
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22217 diff changeset	1093 if (ZlibError != NULL) {
cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22217 diff changeset	1094 Py_INCREF(ZlibError);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	1095 PyModule_AddObject(m, "error", ZlibError);
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22217 diff changeset	1096 }
20469 c46e94fd6986 Reformat! Jeremy Hylton <jeremy@alum.mit.edu> parents: 20466 diff changeset	1097 PyModule_AddIntConstant(m, "MAX_WBITS", MAX_WBITS);
c46e94fd6986 Reformat! Jeremy Hylton <jeremy@alum.mit.edu> parents: 20466 diff changeset	1098 PyModule_AddIntConstant(m, "DEFLATED", DEFLATED);
c46e94fd6986 Reformat! Jeremy Hylton <jeremy@alum.mit.edu> parents: 20466 diff changeset	1099 PyModule_AddIntConstant(m, "DEF_MEM_LEVEL", DEF_MEM_LEVEL);
c46e94fd6986 Reformat! Jeremy Hylton <jeremy@alum.mit.edu> parents: 20466 diff changeset	1100 PyModule_AddIntConstant(m, "Z_BEST_SPEED", Z_BEST_SPEED);
c46e94fd6986 Reformat! Jeremy Hylton <jeremy@alum.mit.edu> parents: 20466 diff changeset	1101 PyModule_AddIntConstant(m, "Z_BEST_COMPRESSION", Z_BEST_COMPRESSION);
c46e94fd6986 Reformat! Jeremy Hylton <jeremy@alum.mit.edu> parents: 20466 diff changeset	1102 PyModule_AddIntConstant(m, "Z_DEFAULT_COMPRESSION", Z_DEFAULT_COMPRESSION);
c46e94fd6986 Reformat! Jeremy Hylton <jeremy@alum.mit.edu> parents: 20466 diff changeset	1103 PyModule_AddIntConstant(m, "Z_FILTERED", Z_FILTERED);
c46e94fd6986 Reformat! Jeremy Hylton <jeremy@alum.mit.edu> parents: 20466 diff changeset	1104 PyModule_AddIntConstant(m, "Z_HUFFMAN_ONLY", Z_HUFFMAN_ONLY);
c46e94fd6986 Reformat! Jeremy Hylton <jeremy@alum.mit.edu> parents: 20466 diff changeset	1105 PyModule_AddIntConstant(m, "Z_DEFAULT_STRATEGY", Z_DEFAULT_STRATEGY);
20484 1a9494f9edb2 Trimmed trailing whitespace. Tim Peters <tim.peters@gmail.com> parents: 20483 diff changeset	1106
20469 c46e94fd6986 Reformat! Jeremy Hylton <jeremy@alum.mit.edu> parents: 20466 diff changeset	1107 PyModule_AddIntConstant(m, "Z_FINISH", Z_FINISH);
c46e94fd6986 Reformat! Jeremy Hylton <jeremy@alum.mit.edu> parents: 20466 diff changeset	1108 PyModule_AddIntConstant(m, "Z_NO_FLUSH", Z_NO_FLUSH);
c46e94fd6986 Reformat! Jeremy Hylton <jeremy@alum.mit.edu> parents: 20466 diff changeset	1109 PyModule_AddIntConstant(m, "Z_SYNC_FLUSH", Z_SYNC_FLUSH);
c46e94fd6986 Reformat! Jeremy Hylton <jeremy@alum.mit.edu> parents: 20466 diff changeset	1110 PyModule_AddIntConstant(m, "Z_FULL_FLUSH", Z_FULL_FLUSH);
20484 1a9494f9edb2 Trimmed trailing whitespace. Tim Peters <tim.peters@gmail.com> parents: 20483 diff changeset	1111
42750 ce52cd71a8d9 Convert a bunch of constant strings in C to unicode. Neal Norwitz <nnorwitz@gmail.com> parents: 42334 diff changeset	1112 ver = PyUnicode_FromString(ZLIB_VERSION);
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22217 diff changeset	1113 if (ver != NULL)
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61371 diff changeset	1114 PyModule_AddObject(m, "ZLIB_VERSION", ver);
19798 091c01d07d98 Patch #450702: allow threads when calling into zlib, protect usage of Martin v. Löwis <martin@v.loewis.de> parents: 16735 diff changeset	1115
27653 106a44a4b975 - Thanks to Scott David Daniels, a subtle bug in how the zlib Guido van Rossum <guido@python.org> parents: 24363 diff changeset	1116 PyModule_AddStringConstant(m, "__version__", "1.0");
106a44a4b975 - Thanks to Scott David Daniels, a subtle bug in how the zlib Guido van Rossum <guido@python.org> parents: 24363 diff changeset	1117
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47300 diff changeset	1118 return m;
5352 d5757aad1a4f Added Andrew Kuchling's zlib module. Guido van Rossum <guido@python.org> parents: diff changeset	1119 }

Mercurial > cpython-lru_cache-weakref

annotate Modules/zlibmodule.c @ 61524:4b10ef8a024c 3.1