diff -r 136adbcefa5f Doc/library/zlib.rst --- a/Doc/library/zlib.rst Sun Jan 03 18:00:31 2016 -0800 +++ b/Doc/library/zlib.rst Sat Jan 30 20:32:55 2016 +0200 @@ -46,7 +46,7 @@ platforms, use ``adler32(data) & 0xffffffff``. -.. function:: compress(data[, level]) +.. function:: compress(data, level=6) Compresses the bytes in *data*, returning a bytes object containing compressed data. *level* is an integer from ``0`` to ``9`` controlling the level of compression; diff -r 136adbcefa5f Modules/clinic/zlibmodule.c.h --- a/Modules/clinic/zlibmodule.c.h Sun Jan 03 18:00:31 2016 -0800 +++ b/Modules/clinic/zlibmodule.c.h Sat Jan 30 20:32:55 2016 +0200 @@ -3,7 +3,7 @@ [clinic start generated code]*/ PyDoc_STRVAR(zlib_compress__doc__, -"compress($module, bytes, level=Z_DEFAULT_COMPRESSION, /)\n" +"compress($module, /, bytes, level=Z_DEFAULT_COMPRESSION)\n" "--\n" "\n" "Returns a bytes object containing compressed data.\n" @@ -14,19 +14,20 @@ " Compression level, in 0-9."); #define ZLIB_COMPRESS_METHODDEF \ - {"compress", (PyCFunction)zlib_compress, METH_VARARGS, zlib_compress__doc__}, + {"compress", (PyCFunction)zlib_compress, METH_VARARGS|METH_KEYWORDS, zlib_compress__doc__}, static PyObject * zlib_compress_impl(PyModuleDef *module, Py_buffer *bytes, int level); static PyObject * -zlib_compress(PyModuleDef *module, PyObject *args) +zlib_compress(PyModuleDef *module, PyObject *args, PyObject *kwargs) { PyObject *return_value = NULL; + static char *_keywords[] = {"bytes", "level", NULL}; Py_buffer bytes = {NULL, NULL}; int level = Z_DEFAULT_COMPRESSION; - if (!PyArg_ParseTuple(args, "y*|i:compress", + if (!PyArg_ParseTupleAndKeywords(args, kwargs, "y*|i:compress", _keywords, &bytes, &level)) goto exit; return_value = zlib_compress_impl(module, &bytes, level); @@ -438,4 +439,4 @@ #ifndef ZLIB_COMPRESS_COPY_METHODDEF #define ZLIB_COMPRESS_COPY_METHODDEF #endif /* !defined(ZLIB_COMPRESS_COPY_METHODDEF) */ -/*[clinic end generated code: output=7734aec079550bc8 input=a9049054013a1b77]*/ +/*[clinic end generated code: output=a759593a762e0983 input=a9049054013a1b77]*/ diff -r 136adbcefa5f Modules/zlibmodule.c --- a/Modules/zlibmodule.c Sun Jan 03 18:00:31 2016 -0800 +++ b/Modules/zlibmodule.c Sat Jan 30 20:32:55 2016 +0200 @@ -141,14 +141,13 @@ Binary data to be compressed. level: int(c_default="Z_DEFAULT_COMPRESSION") = Z_DEFAULT_COMPRESSION Compression level, in 0-9. - / Returns a bytes object containing compressed data. [clinic start generated code]*/ static PyObject * zlib_compress_impl(PyModuleDef *module, Py_buffer *bytes, int level) -/*[clinic end generated code: output=5d7dd4588788efd3 input=be3abe9934bda4b3]*/ +/*[clinic end generated code: output=5d7dd4588788efd3 input=1f9aff7f99080b37]*/ { PyObject *ReturnVal = NULL; Byte *input, *output = NULL;