From: Nadeem Vawda <nadeem.vawda@gmail.com>
Date: Fri, 27 May 2011 00:03:06 +0000 (+0200)
Subject: Merge heads
X-Git-Tag: v3.3.0a1~2183^2~81
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4e18ac850f4ba24d5de10137b9e04a900fc3e215;p=thirdparty%2FPython%2Fcpython.git

Merge heads
---

4e18ac850f4ba24d5de10137b9e04a900fc3e215
diff --cc Misc/NEWS
index 715539d52506,503661acdfce..0514c9652798
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -161,11 -161,9 +161,14 @@@ Core and Builtin
  Library
  -------
  
+ - Issue #1625: BZ2File and bz2.decompress() now support multi-stream files.
+   Initial patch by Nir Aides.
+ 
 +- Issue #8796: codecs.open() calls the builtin open() function instead of using
 +  StreamReaderWriter. Deprecate StreamReader, StreamWriter, StreamReaderWriter,
 +  StreamRecoder and EncodedFile() of the codec module. Use the builtin open()
 +  function or io.TextIOWrapper instead.
 +
  - Issue #12175: BufferedReader.read(-1) now calls raw.readall() if available.
  
  - Issue #12175: FileIO.readall() now only reads the file position and size