Issue #1785: Fix inspect and pydoc with misbehaving descriptors.

Also fixes issue #13581: `help(type)` wouldn't display anything.

diff --cc Lib/inspect.py
Simple merge

diff --cc Lib/pydoc.py
Simple merge

diff --cc Lib/test/test_inspect.py
Simple merge

diff --cc Misc/NEWS
index 69552585722701fe22ddd666fdaf20a9d89f5670,1ad91c02856802f69f897ffde6010f1f1a47aa6d..98889a5eaa9b59a3e572e5c7dc01e008e0e3d530
--- 1/Misc/NEWS
--- 2/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.