[Python-checkins] cpython (merge 3.4 -> default): merge 3.4 (#21404)

[benjamin.peterson]

http://hg.python.org/cpython/rev/171e8f6c814c
changeset:   91066:171e8f6c814c
parent:      91063:d5998cca01a8
parent:      91065:0c712828fb6e
user:        Benjamin Peterson <benjamin at python.org>
date:        Sat Jun 07 12:48:09 2014 -0700
summary:
  merge 3.4 (#21404)

files:
  Doc/library/tarfile.rst |  4 ++++
  Misc/ACKS               |  1 +
  2 files changed, 5 insertions(+), 0 deletions(-)


diff --git a/Doc/library/tarfile.rst b/Doc/library/tarfile.rst
--- a/Doc/library/tarfile.rst
+++ b/Doc/library/tarfile.rst
@@ -81,6 +81,10 @@
    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
diff --git a/Misc/ACKS b/Misc/ACKS
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -196,6 +196,7 @@
 Alastair Burt
 Tarn Weisner Burton
 Lee Busby
+Katherine Busch
 Ralph Butler
 Nicolas Cadou
 Jp Calderone

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