summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorR. David Murray <rdmurray@bitdance.com>2009-05-04 22:59:07 (GMT)
committerR. David Murray <rdmurray@bitdance.com>2009-05-04 22:59:07 (GMT)
commitb18500d39d791c879e9904ebac293402b4a7cd34 (patch)
tree109aad772fed30511f12977cc4b10b9b3fd56722 /Misc
parente04b627a116b4fed8fd76f9376ef53592c49d183 (diff)
downloadcpython-b18500d39d791c879e9904ebac293402b4a7cd34.zip
cpython-b18500d39d791c879e9904ebac293402b4a7cd34.tar.gz
cpython-b18500d39d791c879e9904ebac293402b4a7cd34.tar.bz2
Merged revisions 72299 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r72299 | r.david.murray | 2009-05-04 18:16:24 -0400 (Mon, 04 May 2009) | 7 lines 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 81adc94..a384c41 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -12,6 +12,10 @@ What's New in Python 3.1 beta 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.