summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@haypocalc.com>2011-07-04 00:43:09 (GMT)
committerVictor Stinner <victor.stinner@haypocalc.com>2011-07-04 00:43:09 (GMT)
commit8b0508ed4e1ab32422cf2494c7cd345634912b98 (patch)
tree6f6d7b92c301b994e3b19f76885b82f257af175c
parentaa90e7c573ee2edd41a21d2a9f34e6f3d728f5e5 (diff)
downloadcpython-8b0508ed4e1ab32422cf2494c7cd345634912b98.zip
cpython-8b0508ed4e1ab32422cf2494c7cd345634912b98.tar.gz
cpython-8b0508ed4e1ab32422cf2494c7cd345634912b98.tar.bz2
Issue #12467: warnings: fix a race condition if a warning is emitted at
shutdown, if globals()['__file__'] is None.
-rw-r--r--Lib/test/test_warnings.py12
-rw-r--r--Misc/NEWS3
-rw-r--r--Python/_warnings.c2
3 files changed, 16 insertions, 1 deletions
diff --git a/Lib/test/test_warnings.py b/Lib/test/test_warnings.py
index dbf30e9..79be835 100644
--- a/Lib/test/test_warnings.py
+++ b/Lib/test/test_warnings.py
@@ -542,6 +542,18 @@ class _WarningsTests(BaseTest):
assert expected_line
self.assertEqual(second_line, expected_line)
+ def test_filename_none(self):
+ # issue #12467: race condition if a warning is emitted at shutdown
+ globals_dict = globals()
+ oldfile = globals_dict['__file__']
+ try:
+ with original_warnings.catch_warnings(module=self.module) as w:
+ self.module.filterwarnings("always", category=UserWarning)
+ globals_dict['__file__'] = None
+ original_warnings.warn('test', UserWarning)
+ finally:
+ globals_dict['__file__'] = oldfile
+
class WarningsDisplayTests(unittest.TestCase):
diff --git a/Misc/NEWS b/Misc/NEWS
index 5d4ed6f..401a8ea 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -19,6 +19,9 @@ Core and Builtins
Library
-------
+- Issue #12467: warnings: fix a race condition if a warning is emitted at
+ shutdown, if globals()['__file__'] is None.
+
- Issue #12451: pydoc: importfile() now opens the Python script in binary mode,
instead of text mode using the locale encoding, to avoid encoding issues.
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);