From: Antoine Pitrou <solipsis@pitrou.net>
Date: Wed, 21 Dec 2011 08:59:49 +0000 (+0100)
Subject: Issue #1785: Fix inspect and pydoc with misbehaving descriptors.
X-Git-Tag: v3.3.0a1~544^2~6
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=12f65d1fefde68ae142b96075917012a61cb8abf;p=thirdparty%2FPython%2Fcpython.git

Issue #1785: Fix inspect and pydoc with misbehaving descriptors.
Also fixes issue #13581: `help(type)` wouldn't display anything.
---

12f65d1fefde68ae142b96075917012a61cb8abf
diff --cc Misc/NEWS
index 695525857227,1ad91c028568..98889a5eaa9b
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -419,19 -97,8 +419,21 @@@ Core and Builtin
  Library
  -------
  
+ - Issue #1785: Fix inspect and pydoc with misbehaving descriptors.
+ 
 +- Issue #13637: "a2b" functions in the binascii module now accept ASCII-only
 +  unicode strings.
 +
 +- Issue #13634: Add support for querying and disabling SSL compression.
 +
 +- Issue #13627: Add support for SSL Elliptic Curve-based Diffie-Hellman
 +  key exchange, through the SSLContext.set_ecdh_curve() method and the
 +  ssl.OP_SINGLE_ECDH_USE option.
 +
 +- Issue #13635: Add ssl.OP_CIPHER_SERVER_PREFERENCE, so that SSL servers
 +  choose the cipher based on their own preferences, rather than on the
 +  client's.
 +
  - Issue #11813: Fix inspect.getattr_static for modules. Patch by Andreas
    Stührk.