merge with 3.3

This commit is contained in:
Georg Brandl 2013-10-17 19:52:33 +02:00
commit 2bb0ac0ace
1 changed files with 1 additions and 2 deletions

View File

@ -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. that are expected to be most common should come at the end of the dictionary.
.. versionchanged:: 3.3 .. versionchanged:: 3.3
Added the *method*, *wbits*, *memlevel*, *strategy* and *zdict* Added the *zdict* parameter and keyword argument support.
parameters.
.. function:: crc32(data[, value]) .. function:: crc32(data[, value])