From: Victor Stinner <victor.stinner@haypocalc.com>
Date: Sun, 1 May 2011 21:48:41 +0000 (+0200)
Subject: (Merge 3.2) Issue #9756: credit the author, Andreas Stührk (Trundle)
X-Git-Tag: v3.3.0a1~2440
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d23820b7c92e0c7810138db6e9937112a438c636;p=python

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

d23820b7c92e0c7810138db6e9937112a438c636
diff --cc Misc/NEWS
index d9af0c4f6d,592223348c..39d3da4aee
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -13,12 -13,8 +13,12 @@@ Core and Builtin
  - 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
 +  by Charles-François Natali.
 +
  - Issue #10914: Initialize correctly the filesystem codec when creating a new
    subinterpreter to fix a bootstrap issue with codecs implemented in Python, as
    the ISO-8859-15 codec.