[Python-checkins] cpython (merge 3.3 -> default): merge with 3.3
georg.brandl
python-checkins at python.org
Thu Oct 17 19:51:42 CEST 2013
http://hg.python.org/cpython/rev/22931761e4a3
changeset: 86409:22931761e4a3
parent: 86406:51480f6428a5
parent: 86408:0fff9feb4bdf
user: Georg Brandl <georg at python.org>
date: Thu Oct 17 19:52:33 2013 +0200
summary:
merge with 3.3
files:
Doc/library/zlib.rst | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/Doc/library/zlib.rst b/Doc/library/zlib.rst
--- a/Doc/library/zlib.rst
+++ b/Doc/library/zlib.rst
@@ -88,8 +88,7 @@
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])
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list