From 0fc8f00252d305a3a45ee8cf924e0b5d6be4472b Mon Sep 17 00:00:00 2001 From: Guido van Rossum Date: Tue, 15 Apr 2003 15:12:39 +0000 Subject: - 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. --- Python/pystate.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'Python/pystate.c') diff --git a/Python/pystate.c b/Python/pystate.c index 1139851c3c..62bf09b626 100644 --- a/Python/pystate.c +++ b/Python/pystate.c @@ -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; } -- cgit v1.2.1