diff options
author | Gregory P. Smith <greg@krypto.org> | 2015-01-22 22:56:06 -0800 |
---|---|---|
committer | Gregory P. Smith <greg@krypto.org> | 2015-01-22 22:56:06 -0800 |
commit | 8d0474182b3c0dba017357ed7e3a7d6b5a0e05cb (patch) | |
tree | 5635e9e954272393a993fdaa3cf563e91f86f383 /Python/sysmodule.c | |
parent | 52d4e1bd942e0dd6209c9e60b3f3cc98eea14b90 (diff) | |
parent | 07a465b24e1fc5e4804e536312c917017d0b663e (diff) | |
download | cpython-8d0474182b3c0dba017357ed7e3a7d6b5a0e05cb.tar.gz |
revert 7b833bd1f509. I misread the side effect that the code was triggering.
*any* kwarg supplied to _assert_python causes it to not append -E to the
command line flags so without='-E' does effectively work.
Diffstat (limited to 'Python/sysmodule.c')
-rw-r--r-- | Python/sysmodule.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/Python/sysmodule.c b/Python/sysmodule.c index 290eec1199..0639231282 100644 --- a/Python/sysmodule.c +++ b/Python/sysmodule.c @@ -1121,6 +1121,16 @@ PyDoc_STRVAR(sys_clear_type_cache__doc__, "_clear_type_cache() -> None\n\ Clear the internal type lookup cache."); +static PyObject * +sys_is_finalizing(PyObject* self, PyObject* args) +{ + return PyBool_FromLong(_Py_Finalizing != NULL); +} + +PyDoc_STRVAR(is_finalizing_doc, +"is_finalizing()\n\ +Return True if Python is exiting."); + static PyMethodDef sys_methods[] = { /* Might as well keep this in alphabetic order */ @@ -1167,6 +1177,7 @@ static PyMethodDef sys_methods[] = { getwindowsversion_doc}, #endif /* MS_WINDOWS */ {"intern", sys_intern, METH_VARARGS, intern_doc}, + {"is_finalizing", sys_is_finalizing, METH_NOARGS, is_finalizing_doc}, #ifdef USE_MALLOPT {"mdebug", sys_mdebug, METH_VARARGS}, #endif @@ -1681,7 +1692,7 @@ _PySys_Init(void) } #endif - /* stdin/stdout/stderr are now set by pythonrun.c */ + /* stdin/stdout/stderr are set in pylifecycle.c */ SET_SYS_FROM_STRING_BORROW("__displayhook__", PyDict_GetItemString(sysdict, "displayhook")); |