mirror of
https://github.com/python/cpython
synced 2024-09-21 03:13:32 +00:00
Issue #12467: warnings: fix a race condition if a warning is emitted at
shutdown, if globals()['__file__'] is None.
This commit is contained in:
parent
aa90e7c573
commit
8b0508ed4e
|
@ -542,6 +542,18 @@ def test_show_warning_output(self):
|
|||
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):
|
||||
|
||||
|
|
|
@ -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.
|
||||
|
||||
|
|
|
@ -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);
|
||||
|
||||
|
|
Loading…
Reference in a new issue