summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorRaymond Hettinger <python@rcn.com>2013-09-15 03:51:57 (GMT)
committerRaymond Hettinger <python@rcn.com>2013-09-15 03:51:57 (GMT)
commit46f5ca31d0856f5d258d86085047eda296ee9972 (patch)
tree43404ae894e1ac40995ef165f165df1fb3950442 /Misc
parent0a32d92bffc9c845253718c43e7ae91cf62bacda (diff)
downloadcpython-46f5ca31d0856f5d258d86085047eda296ee9972.zip
cpython-46f5ca31d0856f5d258d86085047eda296ee9972.tar.gz
cpython-46f5ca31d0856f5d258d86085047eda296ee9972.tar.bz2
Issue #19018: The heapq.merge() function no longer suppresses IndexError
Diffstat (limited to 'Misc')
-rw-r--r--Misc/ACKS2
-rw-r--r--Misc/NEWS3
2 files changed, 5 insertions, 0 deletions
diff --git a/Misc/ACKS b/Misc/ACKS
index 9781600..b5ebf06 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -133,6 +133,7 @@ Paul Boddie
Matthew Boedicker
Robin Boerdijk
David Bolen
+Wouter Bolsterlee
Gawain Bolton
Forest Bond
Gregory Bond
@@ -382,6 +383,7 @@ Nils Fischbeck
Frederik Fix
Matt Fleming
Hernán Martínez Foffani
+Artem Fokin
Arnaud Fontaine
Michael Foord
Amaury Forgeot d'Arc
diff --git a/Misc/NEWS b/Misc/NEWS
index 1655238..f74cdb1 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -72,6 +72,9 @@ Library
- Issue #17324: Fix http.server's request handling case on trailing '/'. Patch
contributed by Vajrasky Kok.
+- Issue #19018: The heapq.merge() function no longer suppresses IndexError
+ in the underlying iterables.
+
- Issue #18784: The uuid module no more attempts to load libc via ctypes.CDLL,
if all necessary functions are already found in libuuid.
Patch by Evgeny Sologubov.