diff options
author | Benjamin Peterson <benjamin@python.org> | 2014-06-07 19:48:09 (GMT) |
---|---|---|
committer | Benjamin Peterson <benjamin@python.org> | 2014-06-07 19:48:09 (GMT) |
commit | 33919e8423784fa0172a0ce2d82ce1248be301bd (patch) | |
tree | ba859bc1d42f2441eab1acc103a24b12a48523dc | |
parent | 3e439797bad59948ff810aeaf7e992b23451ddd6 (diff) | |
parent | 9b2731bfdd9756592ae86b2b053969d40c9fa151 (diff) | |
download | cpython-33919e8423784fa0172a0ce2d82ce1248be301bd.zip cpython-33919e8423784fa0172a0ce2d82ce1248be301bd.tar.gz cpython-33919e8423784fa0172a0ce2d82ce1248be301bd.tar.bz2 |
merge 3.4 (#21404)
-rw-r--r-- | Doc/library/tarfile.rst | 4 | ||||
-rw-r--r-- | Misc/ACKS | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/Doc/library/tarfile.rst b/Doc/library/tarfile.rst index 1ef2703..15b88f8 100644 --- a/Doc/library/tarfile.rst +++ b/Doc/library/tarfile.rst @@ -81,6 +81,10 @@ Some facts and figures: If *fileobj* is specified, it is used as an alternative to a :term:`file object` opened in binary mode for *name*. It is supposed to be at position 0. + For modes ``'w:gz'``, ``'r:gz'``, ``'w:bz2'``, ``'r:bz2'``, :func:`tarfile.open` + accepts the keyword argument *compresslevel* to specify the compression level of + the file. + For special purposes, there is a second format for *mode*: ``'filemode|[compression]'``. :func:`tarfile.open` will return a :class:`TarFile` object that processes its data as a stream of blocks. No random seeking will @@ -196,6 +196,7 @@ Roger Burnham Alastair Burt Tarn Weisner Burton Lee Busby +Katherine Busch Ralph Butler Nicolas Cadou Jp Calderone |