diff options
| author | Victor Stinner <victor.stinner@haypocalc.com> | 2011-07-04 00:56:10 (GMT) |
|---|---|---|
| committer | Victor Stinner <victor.stinner@haypocalc.com> | 2011-07-04 00:56:10 (GMT) |
| commit | 5a21e83119ddb2d641ce9937e245ea94caadf5a6 (patch) | |
| tree | 66b663af66adc9290e244f760b61a2fac0e106eb /Python | |
| parent | 10cdc63dd4ee3b00bce4a3cf34c1225b46254b7c (diff) | |
| parent | 8b0508ed4e1ab32422cf2494c7cd345634912b98 (diff) | |
| download | cpython-5a21e83119ddb2d641ce9937e245ea94caadf5a6.zip cpython-5a21e83119ddb2d641ce9937e245ea94caadf5a6.tar.gz cpython-5a21e83119ddb2d641ce9937e245ea94caadf5a6.tar.bz2 | |
(merge 3.2) Issue #12467: warnings: fix a race condition if a warning is
emitted at shutdown, if globals()['__file__'] is None.
Diffstat (limited to 'Python')
| -rw-r--r-- | Python/_warnings.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Python/_warnings.c b/Python/_warnings.c index a797887..07fd683 100644 --- a/Python/_warnings.c +++ b/Python/_warnings.c @@ -496,7 +496,7 @@ setup_context(Py_ssize_t stack_level, PyObject **filename, int *lineno, /* Setup filename. */ *filename = PyDict_GetItemString(globals, "__file__"); - if (*filename != NULL) { + if (*filename != NULL && PyUnicode_Check(*filename)) { Py_ssize_t len = PyUnicode_GetSize(*filename); Py_UNICODE *unicode = PyUnicode_AS_UNICODE(*filename); |