summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@haypocalc.com>2011-05-01 21:43:37 (GMT)
committerVictor Stinner <victor.stinner@haypocalc.com>2011-05-01 21:43:37 (GMT)
commite363ec10578d7c378998a2170fb7babe3cfb6586 (patch)
tree1164473d6ece233ded4d00f5e52e3f7607b94245 /Misc
parent12b8fcfc45373ba48961866289809a004fcd5c14 (diff)
downloadcpython-e363ec10578d7c378998a2170fb7babe3cfb6586.zip
cpython-e363ec10578d7c378998a2170fb7babe3cfb6586.tar.gz
cpython-e363ec10578d7c378998a2170fb7babe3cfb6586.tar.bz2
(Merge 3.1) Issue #9756: When calling a method descriptor or a slot wrapper
descriptor, the check of the object type doesn't read the __class__ attribute anymore. Fix a crash if a class override its __class__ attribute (e.g. a proxy of the str type).
Diffstat (limited to 'Misc')
-rw-r--r--Misc/NEWS5
1 files changed, 5 insertions, 0 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index bb6f5ef..6674c0b 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -9,6 +9,11 @@ What's New in Python 2.7.2?
Core and Builtins
-----------------
+- Issue #9756: When calling a method descriptor or a slot wrapper descriptor,
+ the check of the object type doesn't read the __class__ attribute anymore.
+ Fix a crash if a class override its __class__ attribute (e.g. a proxy of the
+ str type).
+
- Issue #10517: After fork(), reinitialize the TLS used by the PyGILState_*
APIs, to avoid a crash with the pthread implementation in RHEL 5. Patch
by Charles-François Natali.