From 97cf585f4b701fd35524b3f92aa26ef35162f72e Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Sun, 1 May 2011 23:51:11 +0200 Subject: =?UTF-8?q?(Merge=203.1)=20Issue=20#9756:=20credit=20the=20author,?= =?UTF-8?q?=20Andreas=20St=C3=BChrk=20(Trundle)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Misc/ACKS | 1 + Misc/NEWS | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Misc/ACKS b/Misc/ACKS index 450a3a5..3c0e370 100644 --- a/Misc/ACKS +++ b/Misc/ACKS @@ -780,6 +780,7 @@ Ken Stox Patrick Strawderman Dan Stromberg Daniel Stutzbach +Andreas Stührk Nathan Sullivan Mark Summerfield Hisao Suzuki diff --git a/Misc/NEWS b/Misc/NEWS index 6674c0b..0030bab 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -12,7 +12,7 @@ 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). + str type). Patch written by Andreas Stührk. - Issue #10517: After fork(), reinitialize the TLS used by the PyGILState_* APIs, to avoid a crash with the pthread implementation in RHEL 5. Patch -- cgit v0.12