From: Éric Araujo Date: Sun, 5 Feb 2012 12:49:59 +0000 (+0100) Subject: Merge edits from 3.2 (#13716, #1040439, #2945, #13770, #6715) X-Git-Tag: v3.3.0a1~241 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cd0d951a707c0dbecfd45c14b0e6ec7bf83103a2;p=thirdparty%2FPython%2Fcpython.git Merge edits from 3.2 (#13716, #1040439, #2945, #13770, #6715) --- cd0d951a707c0dbecfd45c14b0e6ec7bf83103a2 diff --cc Doc/library/archiving.rst index b7d400ce8585,75d137c9a8d0..c9284949af49 --- a/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 7275e1263d06,d13f6e091003..9577f31247bc --- a/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 +.. moduleauthor:: Nadeem Vawda .. sectionauthor:: Gustavo Niemeyer +.. sectionauthor:: Nadeem Vawda -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/tarfile.rst index 4a9db8e7f216,46e4900b40be..92e9df7b50cc --- a/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 `. Some facts and figures: diff --cc Lib/shutil.py index 5f69fb7b75d6,d1b1af3246af..db80faf8b072 --- a/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 9f662551f72c,313aed5dd096..b38673b98697 --- a/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 920974c53a9a,70c5f10071a0..470982898637 --- a/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)