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

Merge heads
---

d7fc141c7d5c51b5217a6144248e2d1eff68bcb8
diff --cc Misc/NEWS
index 1c4a4b0b06,df4a024d93..99e62818a8
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -137,9 -137,9 +137,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.