summaryrefslogtreecommitdiffstats
path: root/Modules/clinic
diff options
context:
space:
mode:
authorMartin Panter <vadmium+py@gmail.com>2016-02-03 07:52:06 (GMT)
committerMartin Panter <vadmium+py@gmail.com>2016-02-03 07:52:06 (GMT)
commit8254f793c073b1c802b12c31918ad2ac687d1f72 (patch)
treeae50b234c3ed825336321fc59726704066cea850 /Modules/clinic
parentc9deece272abe87865d91f3077fe4591e57303ad (diff)
parent567d513b9bf24ea5f58c4ca0fc3e25c887b85dcf (diff)
downloadcpython-8254f793c073b1c802b12c31918ad2ac687d1f72.zip
cpython-8254f793c073b1c802b12c31918ad2ac687d1f72.tar.gz
cpython-8254f793c073b1c802b12c31918ad2ac687d1f72.tar.bz2
Issue #26244: Merge zlib documentation from 3.5
Diffstat (limited to 'Modules/clinic')
-rw-r--r--Modules/clinic/zlibmodule.c.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/Modules/clinic/zlibmodule.c.h b/Modules/clinic/zlibmodule.c.h
index c5cdf42..2d75bc9 100644
--- a/Modules/clinic/zlibmodule.c.h
+++ b/Modules/clinic/zlibmodule.c.h
@@ -89,8 +89,9 @@ PyDoc_STRVAR(zlib_compressobj__doc__,
"Return a compressor object.\n"
"\n"
" level\n"
-" The compression level (an integer in the range 0-9; default is 6).\n"
-" Higher compression levels are slower, but produce smaller results.\n"
+" The compression level (an integer in the range 0-9 or -1; default is\n"
+" currently equivalent to 6). Higher compression levels are slower,\n"
+" but produce smaller results.\n"
" method\n"
" The compression algorithm. If given, this must be DEFLATED.\n"
" wbits\n"
@@ -438,4 +439,4 @@ exit:
#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=cf81e1deae3af0ce input=a9049054013a1b77]*/