From: Armin Rigo <arigo@tunes.org>
Date: Sat, 10 Jun 2006 10:57:40 +0000 (+0000)
Subject: SF bug #1503294.
X-Git-Tag: v2.5b1~159
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=acd0d6d4160c6b7f12d80807a4312f6f57338b4d;p=thirdparty%2FPython%2Fcpython.git

SF bug #1503294.

PyThreadState_GET() complains if the tstate is NULL, but only in debug mode.
---

diff --git a/Objects/dictobject.c b/Objects/dictobject.c
index f9e45fd86242..c02f1b2679c9 100644
--- a/Objects/dictobject.c
+++ b/Objects/dictobject.c
@@ -561,7 +561,7 @@ PyDict_GetItem(PyObject *op, PyObject *key)
 	/* We can arrive here with a NULL tstate during initialization:
 	   try running "python -Wi" for an example related to string
 	   interning.  Let's just hope that no exception occurs then... */
-	tstate = PyThreadState_GET();
+	tstate = _PyThreadState_Current;
 	if (tstate != NULL && tstate->curexc_type != NULL) {
 		/* preserve the existing exception */
 		PyObject *err_type, *err_value, *err_tb;