summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2013-10-06 17:02:13 (GMT)
committerGeorg Brandl <georg@python.org>2013-10-06 17:02:13 (GMT)
commitb68b970a01338ca3f4ca609486cb3e1512051f9e (patch)
tree04213232bb3607e838c442c560b1cffb2ef5fd97 /Doc
parent434bdf413ff78fe23127da23f267dd0e18d633e8 (diff)
parentffb94ae46f91343ce989242641dd3e022e58623f (diff)
downloadcpython-b68b970a01338ca3f4ca609486cb3e1512051f9e.zip
cpython-b68b970a01338ca3f4ca609486cb3e1512051f9e.tar.gz
cpython-b68b970a01338ca3f4ca609486cb3e1512051f9e.tar.bz2
merge with 3.3
Diffstat (limited to 'Doc')
-rw-r--r--Doc/library/gzip.rst8
1 files changed, 3 insertions, 5 deletions
diff --git a/Doc/library/gzip.rst b/Doc/library/gzip.rst
index 57093e5..ec16f6a 100644
--- a/Doc/library/gzip.rst
+++ b/Doc/library/gzip.rst
@@ -116,13 +116,11 @@ The module defines the following items:
.. 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.