Merged revisions 59488-59511 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r59489 | christian.heimes | 2007-12-14 03:33:57 +0100 (Fri, 14 Dec 2007) | 1 line
Silence a warning about an unsed variable in debug builds
........
r59490 | christian.heimes | 2007-12-14 03:35:23 +0100 (Fri, 14 Dec 2007) | 2 lines
Fixed bug #1620: New @spam.getter property syntax modifies the property in place.
I added also the feature that a @prop.getter decorator does not overwrite the doc string of the property if it was given as an argument to property().
........
r59491 | raymond.hettinger | 2007-12-14 03:49:47 +0100 (Fri, 14 Dec 2007) | 1 line
Cleaner method naming convention
........
r59492 | christian.heimes | 2007-12-14 04:02:34 +0100 (Fri, 14 Dec 2007) | 1 line
Fixed a warning in _codecs_iso2022.c and some non C89 conform // comments.
........
r59493 | christian.heimes | 2007-12-14 05:38:13 +0100 (Fri, 14 Dec 2007) | 1 line
Fixed warning in ssl module
........
r59500 | raymond.hettinger | 2007-12-14 19:08:20 +0100 (Fri, 14 Dec 2007) | 1 line
Add line spacing for readability
........
r59501 | raymond.hettinger | 2007-12-14 19:12:21 +0100 (Fri, 14 Dec 2007) | 3 lines
Update method names for named tuples.
........
r59503 | georg.brandl | 2007-12-14 20:03:36 +0100 (Fri, 14 Dec 2007) | 3 lines
Add a section about nested listcomps to the tutorial.
Thanks to Ian Bruntlett and Robert Lehmann.
........
r59504 | raymond.hettinger | 2007-12-14 20:19:59 +0100 (Fri, 14 Dec 2007) | 1 line
Faster and simpler _replace() method
........
r59505 | raymond.hettinger | 2007-12-14 22:51:50 +0100 (Fri, 14 Dec 2007) | 1 line
Add usage note
........
r59507 | andrew.kuchling | 2007-12-14 23:41:18 +0100 (Fri, 14 Dec 2007) | 1 line
Remove warning about URL
........
r59510 | andrew.kuchling | 2007-12-14 23:52:36 +0100 (Fri, 14 Dec 2007) | 1 line
Bump the version number, and make a few small edits
........
r59511 | christian.heimes | 2007-12-15 00:42:36 +0100 (Sat, 15 Dec 2007) | 2 lines
Fixed bug #1628
The detection now works on Unix with Makefile, Makefile with VPATH and on Windows.
........
2007-12-14 21:27:15 -04:00
|
|
|
# Test case for property
|
|
|
|
# more tests are in test_descr
|
|
|
|
|
|
|
|
import unittest
|
2008-05-20 18:35:26 -03:00
|
|
|
from test.support import run_unittest
|
Merged revisions 59488-59511 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r59489 | christian.heimes | 2007-12-14 03:33:57 +0100 (Fri, 14 Dec 2007) | 1 line
Silence a warning about an unsed variable in debug builds
........
r59490 | christian.heimes | 2007-12-14 03:35:23 +0100 (Fri, 14 Dec 2007) | 2 lines
Fixed bug #1620: New @spam.getter property syntax modifies the property in place.
I added also the feature that a @prop.getter decorator does not overwrite the doc string of the property if it was given as an argument to property().
........
r59491 | raymond.hettinger | 2007-12-14 03:49:47 +0100 (Fri, 14 Dec 2007) | 1 line
Cleaner method naming convention
........
r59492 | christian.heimes | 2007-12-14 04:02:34 +0100 (Fri, 14 Dec 2007) | 1 line
Fixed a warning in _codecs_iso2022.c and some non C89 conform // comments.
........
r59493 | christian.heimes | 2007-12-14 05:38:13 +0100 (Fri, 14 Dec 2007) | 1 line
Fixed warning in ssl module
........
r59500 | raymond.hettinger | 2007-12-14 19:08:20 +0100 (Fri, 14 Dec 2007) | 1 line
Add line spacing for readability
........
r59501 | raymond.hettinger | 2007-12-14 19:12:21 +0100 (Fri, 14 Dec 2007) | 3 lines
Update method names for named tuples.
........
r59503 | georg.brandl | 2007-12-14 20:03:36 +0100 (Fri, 14 Dec 2007) | 3 lines
Add a section about nested listcomps to the tutorial.
Thanks to Ian Bruntlett and Robert Lehmann.
........
r59504 | raymond.hettinger | 2007-12-14 20:19:59 +0100 (Fri, 14 Dec 2007) | 1 line
Faster and simpler _replace() method
........
r59505 | raymond.hettinger | 2007-12-14 22:51:50 +0100 (Fri, 14 Dec 2007) | 1 line
Add usage note
........
r59507 | andrew.kuchling | 2007-12-14 23:41:18 +0100 (Fri, 14 Dec 2007) | 1 line
Remove warning about URL
........
r59510 | andrew.kuchling | 2007-12-14 23:52:36 +0100 (Fri, 14 Dec 2007) | 1 line
Bump the version number, and make a few small edits
........
r59511 | christian.heimes | 2007-12-15 00:42:36 +0100 (Sat, 15 Dec 2007) | 2 lines
Fixed bug #1628
The detection now works on Unix with Makefile, Makefile with VPATH and on Windows.
........
2007-12-14 21:27:15 -04:00
|
|
|
|
|
|
|
class PropertyBase(Exception):
|
|
|
|
pass
|
|
|
|
|
|
|
|
class PropertyGet(PropertyBase):
|
|
|
|
pass
|
|
|
|
|
|
|
|
class PropertySet(PropertyBase):
|
|
|
|
pass
|
|
|
|
|
|
|
|
class PropertyDel(PropertyBase):
|
|
|
|
pass
|
|
|
|
|
|
|
|
class BaseClass(object):
|
|
|
|
def __init__(self):
|
|
|
|
self._spam = 5
|
|
|
|
|
|
|
|
@property
|
|
|
|
def spam(self):
|
|
|
|
"""BaseClass.getter"""
|
|
|
|
return self._spam
|
|
|
|
|
|
|
|
@spam.setter
|
|
|
|
def spam(self, value):
|
|
|
|
self._spam = value
|
|
|
|
|
|
|
|
@spam.deleter
|
|
|
|
def spam(self):
|
|
|
|
del self._spam
|
|
|
|
|
|
|
|
class SubClass(BaseClass):
|
|
|
|
|
|
|
|
@BaseClass.spam.getter
|
|
|
|
def spam(self):
|
|
|
|
"""SubClass.getter"""
|
|
|
|
raise PropertyGet(self._spam)
|
|
|
|
|
|
|
|
@spam.setter
|
|
|
|
def spam(self, value):
|
|
|
|
raise PropertySet(self._spam)
|
|
|
|
|
|
|
|
@spam.deleter
|
|
|
|
def spam(self):
|
|
|
|
raise PropertyDel(self._spam)
|
|
|
|
|
|
|
|
class PropertyDocBase(object):
|
|
|
|
_spam = 1
|
|
|
|
def _get_spam(self):
|
|
|
|
return self._spam
|
|
|
|
spam = property(_get_spam, doc="spam spam spam")
|
|
|
|
|
|
|
|
class PropertyDocSub(PropertyDocBase):
|
|
|
|
@PropertyDocBase.spam.getter
|
|
|
|
def spam(self):
|
|
|
|
"""The decorator does not use this doc string"""
|
|
|
|
return self._spam
|
|
|
|
|
|
|
|
class PropertyTests(unittest.TestCase):
|
|
|
|
def test_property_decorator_baseclass(self):
|
|
|
|
# see #1620
|
|
|
|
base = BaseClass()
|
|
|
|
self.assertEqual(base.spam, 5)
|
|
|
|
self.assertEqual(base._spam, 5)
|
|
|
|
base.spam = 10
|
|
|
|
self.assertEqual(base.spam, 10)
|
|
|
|
self.assertEqual(base._spam, 10)
|
|
|
|
delattr(base, "spam")
|
|
|
|
self.assert_(not hasattr(base, "spam"))
|
|
|
|
self.assert_(not hasattr(base, "_spam"))
|
|
|
|
base.spam = 20
|
|
|
|
self.assertEqual(base.spam, 20)
|
|
|
|
self.assertEqual(base._spam, 20)
|
|
|
|
self.assertEqual(base.__class__.spam.__doc__, "BaseClass.getter")
|
|
|
|
|
|
|
|
def test_property_decorator_subclass(self):
|
|
|
|
# see #1620
|
|
|
|
sub = SubClass()
|
|
|
|
self.assertRaises(PropertyGet, getattr, sub, "spam")
|
|
|
|
self.assertRaises(PropertySet, setattr, sub, "spam", None)
|
|
|
|
self.assertRaises(PropertyDel, delattr, sub, "spam")
|
|
|
|
self.assertEqual(sub.__class__.spam.__doc__, "SubClass.getter")
|
|
|
|
|
|
|
|
def test_property_decorator_doc(self):
|
|
|
|
base = PropertyDocBase()
|
|
|
|
sub = PropertyDocSub()
|
|
|
|
self.assertEqual(base.__class__.spam.__doc__, "spam spam spam")
|
|
|
|
self.assertEqual(sub.__class__.spam.__doc__, "spam spam spam")
|
|
|
|
|
|
|
|
def test_main():
|
|
|
|
run_unittest(PropertyTests)
|
|
|
|
|
|
|
|
if __name__ == '__main__':
|
|
|
|
test_main()
|