From: Victor Stinner <victor.stinner@haypocalc.com>
Date: Sun, 1 May 2011 21:47:56 +0000 (+0200)
Subject: (Merge 3.1) Issue #9756: credit the author, Andreas Stührk (Trundle)
X-Git-Tag: v3.2.1b1~38
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5cf93c68859ed96e776c98081ab7104614ffdbf8;p=thirdparty%2FPython%2Fcpython.git

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

5cf93c68859ed96e776c98081ab7104614ffdbf8
diff --cc Misc/NEWS
index 381c7f27a6bb,67a4bb395c78..592223348ce1
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -13,16 -13,8 +13,16 @@@ 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 #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.
 +
 +- 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 #6780: fix starts/endswith error message to mention that tuples are
    accepted too.