diff options
author | Victor Stinner <victor.stinner@gmail.com> | 2015-10-12 22:11:21 (GMT) |
---|---|---|
committer | Victor Stinner <victor.stinner@gmail.com> | 2015-10-12 22:11:21 (GMT) |
commit | 50856d5ae745d1c9f691afbd78572bf073c941cf (patch) | |
tree | d628ac3d10d0fa02551a8a45d43c03d948306600 /Modules | |
parent | 60f26691f5aeff555f27c62aee11efb07e20ecdc (diff) | |
download | cpython-50856d5ae745d1c9f691afbd78572bf073c941cf.zip cpython-50856d5ae745d1c9f691afbd78572bf073c941cf.tar.gz cpython-50856d5ae745d1c9f691afbd78572bf073c941cf.tar.bz2 |
sys.setrecursionlimit() now raises RecursionError
Issue #25274: sys.setrecursionlimit() now raises a RecursionError if the new
recursion limit is too low depending at the current recursion depth. Modify
also the "lower-water mark" formula to make it monotonic. This mark is used to
decide when the overflowed flag of the thread state is reset.
Diffstat (limited to 'Modules')
-rw-r--r-- | Modules/_testcapimodule.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/Modules/_testcapimodule.c b/Modules/_testcapimodule.c index ba0a24b..9a03648 100644 --- a/Modules/_testcapimodule.c +++ b/Modules/_testcapimodule.c @@ -3518,6 +3518,15 @@ test_PyTime_AsMicroseconds(PyObject *self, PyObject *args) return _PyTime_AsNanosecondsObject(ms); } +static PyObject* +get_recursion_depth(PyObject *self, PyObject *args) +{ + PyThreadState *tstate = PyThreadState_GET(); + + /* substract one to ignore the frame of the get_recursion_depth() call */ + return PyLong_FromLong(tstate->recursion_depth - 1); +} + static PyMethodDef TestMethods[] = { {"raise_exception", raise_exception, METH_VARARGS}, @@ -3694,6 +3703,7 @@ static PyMethodDef TestMethods[] = { #endif {"PyTime_AsMilliseconds", test_PyTime_AsMilliseconds, METH_VARARGS}, {"PyTime_AsMicroseconds", test_PyTime_AsMicroseconds, METH_VARARGS}, + {"get_recursion_depth", get_recursion_depth, METH_NOARGS}, {NULL, NULL} /* sentinel */ }; |