From: Lars Gustäbel <lars@gustaebel.de>
Date: Tue, 6 Dec 2011 12:00:58 +0000 (+0100)
Subject: Merge with 3.2: Correctly detect bzip2 compressed streams with blocksizes other than... 
X-Git-Tag: v3.3.0a1~674
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=45fb08218069ec5589c8595cc34d111846ce016d;p=thirdparty%2FPython%2Fcpython.git

Merge with 3.2: Correctly detect bzip2 compressed streams with blocksizes other than 900k.
---

45fb08218069ec5589c8595cc34d111846ce016d
diff --cc Misc/NEWS
index f941c63128f8,8640d70c458e..c98c9561321a
--- a/Misc/NEWS
+++ 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.