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

diff --git a/Misc/ACKS b/Misc/ACKS
index 450a3a5c3972ae51e4ca8f0fcb935f08671b6092..3c0e37073586482684edb75ea6889d79aa1e696c 100644 (file)
--- 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 6674c0b00e0e01899472857ac0a4e3dbd75334c1..0030bab1a3060578dbd407c2748b434d5127c79a 100644 (file)
--- 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