summaryrefslogtreecommitdiffstats
path: root/Modules
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 /Modules
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 'Modules')
-rw-r--r--Modules/_testcapimodule.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/Modules/_testcapimodule.c b/Modules/_testcapimodule.c
index b90ca57..f5f3ab2 100644
--- a/Modules/_testcapimodule.c
+++ b/Modules/_testcapimodule.c
@@ -706,6 +706,13 @@ test_string_from_format(PyObject *self, PyObject *args)
#undef CHECK_1_FORMAT
}
+/* This is here to provide a docstring for test_descr. */
+static PyObject *
+test_with_docstring(PyObject *self)
+{
+ Py_RETURN_NONE;
+}
+
static PyMethodDef TestMethods[] = {
{"raise_exception", raise_exception, METH_VARARGS},
{"test_config", (PyCFunction)test_config, METH_NOARGS},
@@ -716,6 +723,8 @@ static PyMethodDef TestMethods[] = {
{"test_k_code", (PyCFunction)test_k_code, METH_NOARGS},
{"test_null_strings", (PyCFunction)test_null_strings, METH_NOARGS},
{"test_string_from_format", (PyCFunction)test_string_from_format, METH_NOARGS},
+ {"test_with_docstring", (PyCFunction)test_with_docstring, METH_NOARGS,
+ PyDoc_STR("This is a pretty normal docstring.")},
{"getargs_tuple", getargs_tuple, METH_VARARGS},
{"getargs_b", getargs_b, METH_VARARGS},