changeset:   100144:650cf38fba28
branch:      2.7
parent:      100134:6f7b2b7a029a
user:        Martin Panter <vadmium+py@gmail.com>
date:        Wed Feb 03 07:06:33 2016 +0000
files:       Doc/library/zlib.rst Misc/ACKS Modules/zlibmodule.c
description:
Issue #26244: Clarify default zlib compression level in documentation

Based on patch by Aviv Palivoda.


diff -r 6f7b2b7a029a -r 650cf38fba28 Doc/library/zlib.rst
--- a/Doc/library/zlib.rst	Mon Feb 01 21:58:11 2016 +0000
+++ b/Doc/library/zlib.rst	Wed Feb 03 07:06:33 2016 +0000
@@ -71,10 +71,12 @@
 .. function:: compressobj([level[, method[, wbits[, memlevel[, strategy]]]]])
 
    Returns a compression object, to be used for compressing data streams that won't
-   fit into memory at once.  *level* is an integer from ``0`` to ``9`` controlling
+   fit into memory at once.  *level* is an integer from
+   ``0`` to ``9`` or ``-1``, controlling
    the level of compression; ``1`` is fastest and produces the least compression,
    ``9`` is slowest and produces the most.  ``0`` is no compression.  The default
-   value is ``6``.
+   value is ``-1`` (Z_DEFAULT_COMPRESSION). Z_DEFAULT_COMPRESSION represents a default
+   compromise between speed and compression (currently equivalent to level 6).
 
    *method* is the compression algorithm. Currently, the only supported value is
    ``DEFLATED``.
diff -r 6f7b2b7a029a -r 650cf38fba28 Misc/ACKS
--- a/Misc/ACKS	Mon Feb 01 21:58:11 2016 +0000
+++ b/Misc/ACKS	Wed Feb 03 07:06:33 2016 +0000
@@ -1019,6 +1019,7 @@
 Martin Packman
 Shriphani Palakodety
 Julien Palard
+Aviv Palivoda
 Ondrej Palkovsky
 Mike Pall
 Todd R. Palmer
diff -r 6f7b2b7a029a -r 650cf38fba28 Modules/zlibmodule.c
--- a/Modules/zlibmodule.c	Mon Feb 01 21:58:11 2016 +0000
+++ b/Modules/zlibmodule.c	Wed Feb 03 07:06:33 2016 +0000
@@ -101,7 +101,7 @@
 PyDoc_STRVAR(compressobj__doc__,
 "compressobj([level]) -- Return a compressor object.\n"
 "\n"
-"Optional arg level is the compression level, in 0-9.");
+"Optional arg level is the compression level, in 0-9 or -1.");
 
 PyDoc_STRVAR(decompressobj__doc__,
 "decompressobj([wbits]) -- Return a decompressor object.\n"