[Python-checkins] cpython (merge 3.2 -> default): (merge 3.2) Issue #12467: warnings: fix a race condition if a warning is

[victor.stinner]

http://hg.python.org/cpython/rev/5133fee2433e
changeset:   71174:5133fee2433e
parent:      71172:0159624b1824
parent:      71173:ac18e70cbe7e
user:        Victor Stinner <victor.stinner at haypocalc.com>
date:        Mon Jul 04 02:56:10 2011 +0200
summary:
  (merge 3.2) Issue #12467: warnings: fix a race condition if a warning is
emitted at shutdown, if globals()['__file__'] is None.

files:
  Lib/test/test_warnings.py |  12 ++++++++++++
  Misc/NEWS                 |   3 +++
  Python/_warnings.c        |   2 +-
  3 files changed, 16 insertions(+), 1 deletions(-)


diff --git a/Lib/test/test_warnings.py b/Lib/test/test_warnings.py
--- a/Lib/test/test_warnings.py
+++ b/Lib/test/test_warnings.py
@@ -542,6 +542,18 @@
         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
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -209,6 +209,9 @@
 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
--- a/Python/_warnings.c
+++ b/Python/_warnings.c
@@ -496,7 +496,7 @@
 
     /* 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);
 

-- 
Repository URL: http://hg.python.org/cpython