Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cpython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
cpython
Commits
8b0508ed
Commit
8b0508ed
authored
Jul 04, 2011
by
Victor Stinner
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Issue #12467: warnings: fix a race condition if a warning is emitted at
shutdown, if globals()['__file__'] is None.
parent
aa90e7c5
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
16 additions
and
1 deletion
+16
-1
Lib/test/test_warnings.py
Lib/test/test_warnings.py
+12
-0
Misc/NEWS
Misc/NEWS
+3
-0
Python/_warnings.c
Python/_warnings.c
+1
-1
No files found.
Lib/test/test_warnings.py
View file @
8b0508ed
...
...
@@ -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
):
...
...
Misc/NEWS
View file @
8b0508ed
...
...
@@ -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.
...
...
Python/_warnings.c
View file @
8b0508ed
...
...
@@ -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
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment