[Python-checkins] r74139 - python/trunk/Objects/dictobject.c
benjamin.peterson
python-checkins at python.org
Tue Jul 21 16:08:40 CEST 2009
Author: benjamin.peterson
Date: Tue Jul 21 16:08:40 2009
New Revision: 74139
Log:
must use _PyThreadState_Current so it isn't checked for NULL #6530
Modified:
python/trunk/Objects/dictobject.c
Modified: python/trunk/Objects/dictobject.c
==============================================================================
--- python/trunk/Objects/dictobject.c (original)
+++ python/trunk/Objects/dictobject.c Tue Jul 21 16:08:40 2009
@@ -712,10 +712,12 @@
}
}
- /* 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();
+ /* 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... This must be
+ _PyThreadState_Current and not PyThreadState_GET() because in debug
+ mode, it complains if tstate is NULL. */
+ tstate = _PyThreadState_Current;
if (tstate != NULL && tstate->curexc_type != NULL) {
/* preserve the existing exception */
PyObject *err_type, *err_value, *err_tb;
More information about the Python-checkins
mailing list