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
e900096d
Commit
e900096d
authored
Apr 02, 2012
by
Benjamin Peterson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
prevent writing to stderr from messing up the exception state (closes #14474)
parent
b6af60c2
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
30 additions
and
0 deletions
+30
-0
Lib/test/test_thread.py
Lib/test/test_thread.py
+24
-0
Misc/NEWS
Misc/NEWS
+3
-0
Modules/_threadmodule.c
Modules/_threadmodule.c
+3
-0
No files found.
Lib/test/test_thread.py
View file @
e900096d
...
...
@@ -128,6 +128,30 @@ class ThreadRunningTests(BasicThreadTest):
time
.
sleep
(
0.01
)
self
.
assertEqual
(
thread
.
_count
(),
orig
)
def
test_save_exception_state_on_error
(
self
):
# See issue #14474
def
task
():
started
.
release
()
sys
.
stderr
=
stderr
raise
SyntaxError
def
mywrite
(
self
,
*
args
):
try
:
raise
ValueError
except
ValueError
:
pass
real_write
(
self
,
*
args
)
c
=
thread
.
_count
()
started
=
thread
.
allocate_lock
()
with
support
.
captured_output
(
"stderr"
)
as
stderr
:
real_write
=
stderr
.
write
stderr
.
write
=
mywrite
started
.
acquire
()
thread
.
start_new_thread
(
task
,
())
started
.
acquire
()
while
thread
.
_count
()
>
c
:
pass
self
.
assertIn
(
"Traceback"
,
stderr
.
getvalue
())
class
Barrier
:
def
__init__
(
self
,
num_threads
):
...
...
Misc/NEWS
View file @
e900096d
...
...
@@ -10,6 +10,9 @@ What's New in Python 3.2.4
Core and Builtins
-----------------
- Issue #14474: Save and restore exception state in thread.start_new_thread()
while writing error message if the thread leaves a unhandled exception.
- Issue #13019: Fix potential reference leaks in bytearray.extend(). Patch
by Suman Saha.
...
...
Modules/_threadmodule.c
View file @
e900096d
...
...
@@ -994,14 +994,17 @@ t_bootstrap(void *boot_raw)
PyErr_Clear
();
else
{
PyObject
*
file
;
PyObject
*
exc
,
*
value
,
*
tb
;
PySys_WriteStderr
(
"Unhandled exception in thread started by "
);
PyErr_Fetch
(
&
exc
,
&
value
,
&
tb
);
file
=
PySys_GetObject
(
"stderr"
);
if
(
file
!=
NULL
&&
file
!=
Py_None
)
PyFile_WriteObject
(
boot
->
func
,
file
,
0
);
else
PyObject_Print
(
boot
->
func
,
stderr
,
0
);
PySys_WriteStderr
(
"
\n
"
);
PyErr_Restore
(
exc
,
value
,
tb
);
PyErr_PrintEx
(
0
);
}
}
...
...
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