From: Serhiy Storchaka <storchaka@gmail.com>
Date: Sun, 21 Sep 2014 19:25:25 +0000 (+0300)
Subject: Merge heads
X-Git-Tag: v3.5.0a1~885^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1a5426dbaf71d8b414abfc781fecb696c2d751dc;p=python

Merge heads
---

1a5426dbaf71d8b414abfc781fecb696c2d751dc
diff --cc Misc/NEWS
index 956721a756,9e4c55ed43..922999ffc7
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -32,9 -32,9 +32,12 @@@ Core and Builtin
  Library
  -------
  
 +- Issue #22423: Unhandled exception in thread no longer causes unhandled
 +  AttributeError when sys.stderr is None.
 +
+ - Issue #21332: Ensure that ``bufsize=1`` in subprocess.Popen() selects
+   line buffering, rather than block buffering.  Patch by Akira Li.
+ 
  - Issue #21091: Fix API bug: email.message.EmailMessage.is_attachment is now
    a method.  Since EmailMessage is provisional, we can change the API in a
    maintenance release, but we use a trick to remain backward compatible with