summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2015-02-06 03:29:46 (GMT)
committerBenjamin Peterson <benjamin@python.org>2015-02-06 03:29:46 (GMT)
commit6c62ac1a0168529dd17f8d3cbc9182dd5f95cb14 (patch)
tree00a6c70cf6eafa39784418c6975382cec626f6f8 /Misc
parentd0a8f57ef915b2e5b30e3b0dfddd8ec40c850694 (diff)
parent104b9e0ccac493b77ea051cafdf2e02edf2ccfd3 (diff)
downloadcpython-6c62ac1a0168529dd17f8d3cbc9182dd5f95cb14.zip
cpython-6c62ac1a0168529dd17f8d3cbc9182dd5f95cb14.tar.gz
cpython-6c62ac1a0168529dd17f8d3cbc9182dd5f95cb14.tar.bz2
merge 3.4 (#22735)
Diffstat (limited to 'Misc')
-rw-r--r--Misc/ACKS1
-rw-r--r--Misc/NEWS3
2 files changed, 4 insertions, 0 deletions
diff --git a/Misc/ACKS b/Misc/ACKS
index b6ccdc6..c1d0dab 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -16,6 +16,7 @@ Michael Abbott
Rajiv Abraham
David Abrahams
Marc Abramowitz
+Eldar Abusalimov
Ron Adam
Anton Afanasyev
Ali Afshar
diff --git a/Misc/NEWS b/Misc/NEWS
index 9d80d9e..1ed9be8 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,6 +10,9 @@ Release date: TBA
Core and Builtins
-----------------
+- Issue #22735: Fix many edge cases (including crashes) involving custom mro()
+ implementations.
+
- Issue #22896: Avoid using PyObject_AsCharBuffer(), PyObject_AsReadBuffer()
and PyObject_AsWriteBuffer().