summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorR. David Murray <rdmurray@bitdance.com>2009-05-04 22:16:24 (GMT)
committerR. David Murray <rdmurray@bitdance.com>2009-05-04 22:16:24 (GMT)
commit7ba8e1cbfdd262f809038fa590c6004ac71b3ce8 (patch)
tree015d5f8f5efc7b5a15b254825910a5be11ae020e /Misc
parent97377bf56685282ac6e504f64e71794a7bdd80b6 (diff)
downloadcpython-7ba8e1cbfdd262f809038fa590c6004ac71b3ce8.zip
cpython-7ba8e1cbfdd262f809038fa590c6004ac71b3ce8.tar.gz
cpython-7ba8e1cbfdd262f809038fa590c6004ac71b3ce8.tar.bz2
Fix issue 5890: (property subclass shadows __doc__ string) by inserting
the __doc__ into the subclass instance __dict__. The fix refactors property_copy to call property_init in such a way that the __doc__ logic is re-executed correctly when getter_doc is 1, thus simplifying property_copy.
Diffstat (limited to 'Misc')
-rw-r--r--Misc/NEWS4
1 files changed, 4 insertions, 0 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index c8ae918..268a9bb 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -12,6 +12,10 @@ What's New in Python 2.7 alpha 1
Core and Builtins
-----------------
+- Issue #5890: in subclasses of 'property' the __doc__ attribute was
+ shadowed by classtype's, even if it was None. property now
+ inserts the __doc__ into the subclass instance __dict__.
+
- Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal
sequences. Patch by Nick Barnes and Victor Stinner.