summaryrefslogtreecommitdiffstats
path: root/Lib/test/test_descr.py
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2006-08-04 18:03:37 (GMT)
committerGeorg Brandl <georg@python.org>2006-08-04 18:03:37 (GMT)
commite9462c72bd3db9daca682bc7f993f9c77a4022db (patch)
tree1c098858248eb7f7336cb427a64c31feb362f1bf /Lib/test/test_descr.py
parent06ded09d4048bf44ce9b61c82494cf0a0825412c (diff)
downloadcpython-e9462c72bd3db9daca682bc7f993f9c77a4022db.zip
cpython-e9462c72bd3db9daca682bc7f993f9c77a4022db.tar.gz
cpython-e9462c72bd3db9daca682bc7f993f9c77a4022db.tar.bz2
Change fix for segfaulting property(), add a NEWS entry and a test.
Diffstat (limited to 'Lib/test/test_descr.py')
-rw-r--r--Lib/test/test_descr.py10
1 files changed, 10 insertions, 0 deletions
diff --git a/Lib/test/test_descr.py b/Lib/test/test_descr.py
index 6484ef1..e9286b0 100644
--- a/Lib/test/test_descr.py
+++ b/Lib/test/test_descr.py
@@ -2024,6 +2024,16 @@ def properties():
prop2 = property(fset=setter)
vereq(prop2.__doc__, None)
+ # this segfaulted in 2.5b2
+ try:
+ import _testcapi
+ except ImportError:
+ pass
+ else:
+ class X(object):
+ p = property(_testcapi.test_with_docstring)
+
+
def supers():
if verbose: print "Testing super..."