From: Meador Inge <meadori@gmail.com>
Date: Tue, 3 Sep 2013 22:32:13 +0000 (-0500)
Subject: Merge heads.
X-Git-Tag: v3.4.0a2~41
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2b0a98f5405866076456ed55ed6a382c7a3f4260;p=python

Merge heads.
---

2b0a98f5405866076456ed55ed6a382c7a3f4260
diff --cc Misc/NEWS
index 9539d62e13,419a1447f5..958fadbec5
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -54,12 -54,8 +54,14 @@@ Core and Builtin
  Library
  -------
  
+ - Issue #16826: Don't check for PYTHONCASEOK if interpreter started with -E.
+ 
 +- Issue #18901: The sunau getparams method now returns a namedtuple rather than
 +  a plain tuple.  Patch by Claudiu Popa.
 +
 +- Issue #17487: The result of the wave getparams method now is pickleable again.
 +  Patch by Claudiu Popa.
 +
  - Issue #18756: os.urandom() now uses a lazily-opened persistent file
    descriptor, so as to avoid using many file descriptors when run in
    parallel from multiple threads.