It seems to me that all that patch does is re-enable the bug (in the
extension class context) that the patch for this issue was a workaround
for.  I think perhaps the correct fix is to look at how the __doc__
attribute is found in the general case and see if it can be fixed there,
allowing the removal of the workaround in property.

See for example this sub-thread on python-dev:

http://www.mail-archive.com/python-dev@python.org/msg42786.html