[Python-checkins] cpython (merge 3.3 -> default): merge with 3.3

[georg.brandl]

http://hg.python.org/cpython/rev/49e9ae4df749
changeset:   86116:49e9ae4df749
parent:      86113:3dcc03489802
parent:      86115:ad19a9982b03
user:        Georg Brandl <georg at python.org>
date:        Sun Oct 06 19:02:13 2013 +0200
summary:
  merge with 3.3

files:
  Doc/library/gzip.rst |  8 +++-----
  1 files changed, 3 insertions(+), 5 deletions(-)


diff --git a/Doc/library/gzip.rst b/Doc/library/gzip.rst
--- a/Doc/library/gzip.rst
+++ b/Doc/library/gzip.rst
@@ -116,13 +116,11 @@
       .. versionadded:: 3.2
 
    .. versionchanged:: 3.1
-      Support for the :keyword:`with` statement was added.
+      Support for the :keyword:`with` statement was added, along with the
+      *mtime* argument.
 
    .. versionchanged:: 3.2
-      Support for zero-padded files was added.
-
-   .. versionchanged:: 3.2
-      Support for unseekable files was added.
+      Support for zero-padded and unseekable files was added.
 
    .. versionchanged:: 3.3
       The :meth:`io.BufferedIOBase.read1` method is now implemented.

-- 
Repository URL: http://hg.python.org/cpython