Merge edits from 3.2 (#13716, #1040439, #2945, #13770, #6715)

diff --cc Doc/distutils/apiref.rst
Simple merge

diff --cc Doc/library/archiving.rst
index b7d400ce8585b2b7f65b50075632394a8900716d,75d137c9a8d02601a961e0665decb2029506f0b7..c9284949af49726c0c66d2c64b5b16431c5e67cb
--- 1/Doc/library/archiving.rst
--- 2/Doc/library/archiving.rst
+++ b/Doc/library/archiving.rst
@@@ -5,8 -5,8 +5,9 @@@ Data Compression and Archivin
  ******************************
  
  The modules described in this chapter support data compression with the zlib,
 -gzip, and bzip2 algorithms, and  the creation of ZIP- and tar-format archives.
 -See also :ref:`archiving-operations` provided by the :mod:`shutil` module.
 +gzip, bzip2 and lzma algorithms, and the creation of ZIP- and tar-format
- archives.
++archives.  See also :ref:`archiving-operations` provided by the :mod:`shutil`
++module.
  
  
  .. toctree::

diff --cc Doc/library/bz2.rst
index 7275e1263d0697bea8a6141cafdc9c4e90222f23,d13f6e091003570816214e328ed513d130f52335..9577f31247bc6c82c1cf41c06ea62cc0d28667f4
--- 1/Doc/library/bz2.rst
--- 2/Doc/library/bz2.rst
+++ b/Doc/library/bz2.rst
@@@ -1,29 -1,37 +1,26 @@@
 -:mod:`bz2` --- Compression compatible with :program:`bzip2`
 -===========================================================
 +:mod:`bz2` --- Support for :program:`bzip2` compression
 +=======================================================
  
  .. module:: bz2
 -   :synopsis: Interface to compression and decompression routines
 -              compatible with bzip2.
 +   :synopsis: Interfaces for bzip2 compression and decompression.
  .. moduleauthor:: Gustavo Niemeyer <niemeyer@conectiva.com>
 +.. moduleauthor:: Nadeem Vawda <nadeem.vawda@gmail.com>
  .. sectionauthor:: Gustavo Niemeyer <niemeyer@conectiva.com>
 +.. sectionauthor:: Nadeem Vawda <nadeem.vawda@gmail.com>
  
  
 -This module provides a comprehensive interface for the bz2 compression library.
 -It implements a complete file interface, one-shot (de)compression functions, and
 -types for sequential (de)compression.
 +This module provides a comprehensive interface for compressing and
 +decompressing data using the bzip2 compression algorithm.
  
- For related file formats, see the :mod:`gzip`, :mod:`lzma`, :mod:`zipfile`, and
- :mod:`tarfile` modules.
- 
 -Here is a summary of the features offered by the bz2 module:
 +The :mod:`bz2` module contains:
  
 -* :class:`BZ2File` class implements a complete file interface, including
 -  :meth:`~BZ2File.readline`, :meth:`~BZ2File.readlines`,
 -  :meth:`~BZ2File.writelines`, :meth:`~BZ2File.seek`, etc;
 +* The :class:`BZ2File` class for reading and writing compressed files.
 +* The :class:`BZ2Compressor` and :class:`BZ2Decompressor` classes for
 +  incremental (de)compression.
 +* The :func:`compress` and :func:`decompress` functions for one-shot
 +  (de)compression.
  
 -* :class:`BZ2File` class implements emulated :meth:`~BZ2File.seek` support;
 -
 -* :class:`BZ2File` class implements universal newline support;
 -
 -* :class:`BZ2File` class offers an optimized line iteration using a readahead
 -  algorithm;
 -
 -* Sequential (de)compression supported by :class:`BZ2Compressor` and
 -  :class:`BZ2Decompressor` classes;
 -
 -* One-shot (de)compression supported by :func:`compress` and :func:`decompress`
 -  functions;
 -
 -* Thread safety uses individual locking mechanism.
 +All of the classes in this module may safely be accessed from multiple threads.
  
  
  (De)compression of files

diff --cc Doc/library/gzip.rst
Simple merge

diff --cc Doc/library/shutil.rst
Simple merge

diff --cc Doc/library/tarfile.rst
index 4a9db8e7f216b594ae6eea8877845bd441e09aa8,46e4900b40be62e9850f890c3a5804865a033d55..92e9df7b50cccaadb80f31497428fcdae225bcfe
--- 1/Doc/library/tarfile.rst
--- 2/Doc/library/tarfile.rst
+++ b/Doc/library/tarfile.rst
@@@ -13,8 -13,9 +13,9 @@@
  --------------
  
  The :mod:`tarfile` module makes it possible to read and write tar
 -archives, including those using gzip or bz2 compression.
 +archives, including those using gzip, bz2 and lzma compression.
- (:file:`.zip` files can be read and written using the :mod:`zipfile` module.)
+ Use the :mod:`zipfile` module to read or write :file:`.zip` files, or the
+ higher-level functions in :ref:`shutil <archiving-operations>`.
  
  Some facts and figures:
  

diff --cc Doc/library/zlib.rst
Simple merge

diff --cc Lib/distutils/tests/test_bdist_rpm.py
Simple merge

diff --cc Lib/shutil.py
index 5f69fb7b75d6d6d584a3218960d76f9ef8ce2d3a,d1b1af3246af27de78aaf30a78f6ba78b42eb940..db80faf8b0723ec4ee42f583c0d130941b7ae69b
--- 1/Lib/shutil.py
--- 2/Lib/shutil.py
+++ b/Lib/shutil.py
@@@ -552,9 -493,8 +552,8 @@@ def _make_zipfile(base_name, base_dir, 
  
  _ARCHIVE_FORMATS = {
      'gztar': (_make_tarball, [('compress', 'gzip')], "gzip'ed tar-file"),
-     'bztar': (_make_tarball, [('compress', 'bzip2')], "bzip2'ed tar-file"),
      'tar':   (_make_tarball, [('compress', None)], "uncompressed tar file"),
 -    'zip':   (_make_zipfile, [],"ZIP file")
 +    'zip':   (_make_zipfile, [], "ZIP file")
      }
  
  if _BZ2_SUPPORTED:

diff --cc Misc/ACKS
index 9f662551f72ce53a075571b39e7cbdac79cef1d4,313aed5dd096ed5e91cdfbb963b1ec6e8a1eb672..b38673b98697b3930ac8c4cb26f82c1d2bf0095b
--- 1/Misc/ACKS
--- 2/Misc/ACKS
+++ b/Misc/ACKS
@@@ -836,9 -767,10 +836,10 @@@ Vlad Riscuti
  Juan M. Bello Rivas
  Davide Rizzo
  Anthony Roach
+ Carl Robben
  Mark Roberts
 -Jim Robinson
  Andy Robinson
 +Jim Robinson
  Mark Roddy
  Kevin Rodgers
  Giampaolo Rodola

diff --cc Misc/NEWS
index 920974c53a9aa1428689c93dd55e33bbd2de3250,70c5f10071a0503264792399838faaa7bbfdbb52..4709828986376b9cfc915e065aced361c6868fc6
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -466,10 -113,8 +466,12 @@@ Core and Builtin
  Library
  -------
  
+ - Issue #2945: Make the distutils upload command aware of bdist_rpm products.
+ 
 +- Issue #13712: pysetup create should not convert package_data to extra_files.
 +
 +- Issue #11805: package_data in setup.cfg should allow more than one value.
 +
  - Issue #13933: IDLE auto-complete did not work with some imported
    module, like hashlib.  (Patch by Roger Serwy)