summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorÉric Araujo <merwok@netwok.org>2011-11-15 15:12:22 (GMT)
committerÉric Araujo <merwok@netwok.org>2011-11-15 15:12:22 (GMT)
commit3f2ba3bd864d0ca606ff1b96989d7d62905292dd (patch)
treeeeda549080f1b1ce07e86f89a89d1abff4202c75 /Misc
parent2495c6af3baad44a85d2ec9b9aacae2cbad158c0 (diff)
parent4d1554650475cc9a2c2773d6758687f4b3542de9 (diff)
downloadcpython-3f2ba3bd864d0ca606ff1b96989d7d62905292dd.zip
cpython-3f2ba3bd864d0ca606ff1b96989d7d62905292dd.tar.gz
cpython-3f2ba3bd864d0ca606ff1b96989d7d62905292dd.tar.bz2
Branch merge
Diffstat (limited to 'Misc')
-rw-r--r--Misc/ACKS5
-rw-r--r--Misc/NEWS10
2 files changed, 5 insertions, 10 deletions
diff --git a/Misc/ACKS b/Misc/ACKS
index 2d8cd44..986debd 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -378,6 +378,7 @@ Paul ten Hagen
Rasmus Hahn
Peter Haight
Václav Haisman
+Walker Hale IV
Bob Halley
Jesse Hallio
Jun Hamano
@@ -593,6 +594,7 @@ Eric Lindvall
Gregor Lingl
Nick Lockwood
Stephanie Lockwood
+Hugo Lopes Tavares
Anne Lord
Tom Loredo
Justin Love
@@ -606,6 +608,7 @@ Mark Lutz
Jim Lynch
Mikael Lyngvig
Martin von Löwis
+Guillermo López-Anglada
Andrew I MacIntyre
Tim MacKenzie
Nick Maclaren
@@ -805,6 +808,7 @@ Francesco Ricciardi
Tim Rice
Jan Pieter Riegel
Armin Rigo
+Arc Riley
Nicholas Riley
Jean-Claude Rimbault
Vlad Riscutia
@@ -817,6 +821,7 @@ Jim Robinson
Mark Roddy
Kevin Rodgers
Giampaolo Rodola
+Elson Rodriguez
Luis Rojas
Mike Romberg
Armin Ronacher
diff --git a/Misc/NEWS b/Misc/NEWS
index d03f761..334e787 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -963,13 +963,9 @@ Library
- Issue #12049: Add RAND_bytes() and RAND_pseudo_bytes() functions to the ssl
module.
-- Issue #12125: fixed the failures under Solaris due to improper test cleanup.
-
- Issue #6501: os.device_encoding() returns None on Windows if the application
has no console.
-- Issue #12132: Skip test_build_ext in case the xxmodule is not found.
-
- Issue #12105: Add O_CLOEXEC to the os module.
- Issue #12079: Decimal('Infinity').fma(Decimal('0'), (3.91224318126786e+19+0j))
@@ -1695,12 +1691,6 @@ Tests
- Issue #12057: Add tests for ISO 2022 codecs (iso2022_jp, iso2022_jp_2,
iso2022_kr).
-- Issue #12180: Fixed a few remaining errors in test_packaging when no
- threading.
-
-- Issue #12120, #12119: skip a test in packaging and distutils
- if sys.dont_write_bytecode is set to True.
-
- Issue #12096: Fix a race condition in test_threading.test_waitfor(). Patch
written by Charles-François Natali.