From: Benjamin Peterson <benjamin@python.org>
Date: Thu, 23 Apr 2015 21:06:45 +0000 (-0400)
Subject: merge 3.4 (#24044)
X-Git-Tag: v3.5.0b1~297
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a30e2256f70bd43255e8dae6459c70540f118b62;p=python

merge 3.4 (#24044)
---

a30e2256f70bd43255e8dae6459c70540f118b62
diff --cc Misc/NEWS
index 974e9ca9aa,85e55d06a0..4f702d05c2
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -75,9 -20,17 +75,12 @@@ Core and Builtin
  - Issue #22977: Fixed formatting Windows error messages on Wine.
    Patch by Martin Panter.
  
 -- Issue #23803: Fixed str.partition() and str.rpartition() when a separator
 -  is wider then partitioned string.
 -
 -- Issue #23192: Fixed generator lambdas.  Patch by Bruno Cauet.
 -
 -- Issue #23629: Fix the default __sizeof__ implementation for variable-sized
 -  objects.
 +- Issue #23466: %c, %o, %x, and %X in bytes formatting now raise TypeError on
 +  non-integer input.
  
+ - Issue #24044: Fix possible null pointer dereference in list.sort in out of
+   memory conditions.
+ 
  Library
  -------