mirror of
https://github.com/python/cpython.git
synced 2025-11-01 06:01:29 +00:00
- pythunrun.c, Py_Finalize(): move the call to _Py_PrintReferences()
even farther down, to just before the call to _PyObject_DebugMallocStats(). This required the following changes: - pystate.c, PyThreadState_GetDict(): changed not to raise an exception or issue a fatal error when no current thread state is available, but simply return NULL without raising an exception (ever). - object.c, Py_ReprEnter(): when PyThreadState_GetDict() returns NULL, don't raise an exception but return 0. This means that when printing a container that's recursive, printing will go on and on and on. But that shouldn't happen in the case we care about (see first bullet). - Updated Misc/NEWS and Doc/api/init.tex to reflect changes to PyThreadState_GetDict() definition.
This commit is contained in:
parent
6fde1cef4a
commit
0fc8f00252
5 changed files with 28 additions and 17 deletions
|
|
@ -266,17 +266,21 @@ PyThreadState_Swap(PyThreadState *new)
|
|||
/* An extension mechanism to store arbitrary additional per-thread state.
|
||||
PyThreadState_GetDict() returns a dictionary that can be used to hold such
|
||||
state; the caller should pick a unique key and store its state there. If
|
||||
PyThreadState_GetDict() returns NULL, an exception has been raised (most
|
||||
likely MemoryError) and the caller should pass on the exception. */
|
||||
PyThreadState_GetDict() returns NULL, an exception has *not* been raised
|
||||
and the caller should assume no per-thread state is available. */
|
||||
|
||||
PyObject *
|
||||
PyThreadState_GetDict(void)
|
||||
{
|
||||
if (_PyThreadState_Current == NULL)
|
||||
Py_FatalError("PyThreadState_GetDict: no current thread");
|
||||
return NULL;
|
||||
|
||||
if (_PyThreadState_Current->dict == NULL)
|
||||
_PyThreadState_Current->dict = PyDict_New();
|
||||
if (_PyThreadState_Current->dict == NULL) {
|
||||
PyObject *d;
|
||||
_PyThreadState_Current->dict = d = PyDict_New();
|
||||
if (d == NULL)
|
||||
PyErr_Clear();
|
||||
}
|
||||
return _PyThreadState_Current->dict;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue