From: Victor Stinner <victor.stinner@haypocalc.com>
Date: Sun, 1 May 2011 21:51:11 +0000 (+0200)
Subject: (Merge 3.1) Issue #9756: credit the author, Andreas Stührk (Trundle)
X-Git-Tag: v2.7.2rc1~89
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=97cf585f4b701fd35524b3f92aa26ef35162f72e;p=python

(Merge 3.1) Issue #9756: credit the author, Andreas Stührk (Trundle)
---

diff --git a/Misc/ACKS b/Misc/ACKS
index 450a3a5c39..3c0e370735 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 6674c0b00e..0030bab1a3 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