summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2013-10-17 17:52:33 (GMT)
committerGeorg Brandl <georg@python.org>2013-10-17 17:52:33 (GMT)
commit2bb0ac0acec4b081838a308070747fdadd2d7939 (patch)
treea194115734635ff4c56c868105d2a2ea0d676358
parent8f9571e70ec4fb7e3a257fffea03ff223011d6fb (diff)
parent9ff06dcfad8d089251d5207cb1ce3ffb01885601 (diff)
downloadcpython-2bb0ac0acec4b081838a308070747fdadd2d7939.zip
cpython-2bb0ac0acec4b081838a308070747fdadd2d7939.tar.gz
cpython-2bb0ac0acec4b081838a308070747fdadd2d7939.tar.bz2
merge with 3.3
-rw-r--r--Doc/library/zlib.rst3
1 files changed, 1 insertions, 2 deletions
diff --git a/Doc/library/zlib.rst b/Doc/library/zlib.rst
index 731023e..d9a29a8 100644
--- a/Doc/library/zlib.rst
+++ b/Doc/library/zlib.rst
@@ -88,8 +88,7 @@ The available exception and functions in this module are:
that are expected to be most common should come at the end of the dictionary.
.. versionchanged:: 3.3
- Added the *method*, *wbits*, *memlevel*, *strategy* and *zdict*
- parameters.
+ Added the *zdict* parameter and keyword argument support.
.. function:: crc32(data[, value])