]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merge with 3.2: Correctly detect bzip2 compressed streams with blocksizes other than...
authorLars Gustäbel <lars@gustaebel.de>
Tue, 6 Dec 2011 12:00:58 +0000 (13:00 +0100)
committerLars Gustäbel <lars@gustaebel.de>
Tue, 6 Dec 2011 12:00:58 +0000 (13:00 +0100)
1  2 
Lib/tarfile.py
Lib/test/test_tarfile.py
Misc/NEWS

diff --cc Lib/tarfile.py
Simple merge
Simple merge
diff --cc Misc/NEWS
index f941c63128f895642676e4655f0de46a5ab04ca9,8640d70c458e254f7a9cca790c1bb50e8da7d09f..c98c9561321ac33cec85d49fb9b2c1d3c5963a00
+++ b/Misc/NEWS
@@@ -406,11 -90,11 +406,14 @@@ Core and Builtin
  Library
  -------
  
+ - tarfile.py: Correctly detect bzip2 compressed streams with blocksizes
+   other than 900k.
  - Issue #13439: Fix many errors in turtle docstrings.
  
 +- Issue #6715: Add a module 'lzma' for compression using the LZMA algorithm.
 +  Thanks to Per Øyvind Karlsen for the initial implementation.
 +
  - Issue #13487: Make inspect.getmodule robust against changes done to
    sys.modules while it is iterating over it.