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)
commitb1b25f0ffd6c2d31cf21fa7128ff64c314c3cd2e (patch)
tree0227d262895e628d23cd1c000140d23600f01823
parent7d10a2d88accf1a04cb90ceb991fb5cac0abb698 (diff)
downloadcpython-b1b25f0ffd6c2d31cf21fa7128ff64c314c3cd2e.zip
cpython-b1b25f0ffd6c2d31cf21fa7128ff64c314c3cd2e.tar.gz
cpython-b1b25f0ffd6c2d31cf21fa7128ff64c314c3cd2e.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 52ae888..1518bd1 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -13,6 +13,9 @@ Core and Builtins
Library
-------
+- Issue #12467: warnings: fix a race condition if a warning is emitted at
+ shutdown, if globals()['__file__'] is None.
+
What's New in Python 3.2.1 release candidate 2?
===============================================
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);