diff options
| author | Georg Brandl <georg@python.org> | 2013-10-06 12:33:31 +0200 |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2013-10-06 12:33:31 +0200 |
| commit | 3e1e1cfaa6617830fdf01560b42b950f9b459874 (patch) | |
| tree | 0a9b8827b7e376e4bc4240a9944dae4395a3e2c5 | |
| parent | 5993e29d36f0cd22c06864d03dceee36fb473640 (diff) | |
| parent | f27bfd81ecacd7fb2e6fc801a3709fdf3921dd4c (diff) | |
| download | cpython-git-3e1e1cfaa6617830fdf01560b42b950f9b459874.tar.gz | |
merge with 3.3
| -rw-r--r-- | Doc/library/gzip.rst | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Doc/library/gzip.rst b/Doc/library/gzip.rst index 8a7c928d67..57093e5ce9 100644 --- a/Doc/library/gzip.rst +++ b/Doc/library/gzip.rst @@ -67,7 +67,7 @@ The module defines the following items: object. When *fileobj* is not ``None``, the *filename* argument is only used to be - included in the :program:`gzip` file header, which may includes the original + included in the :program:`gzip` file header, which may include the original filename of the uncompressed file. It defaults to the filename of *fileobj*, if discernible; otherwise, it defaults to the empty string, and in this case the original filename is not included in the header. |