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
52005c2e
Commit
52005c2e
authored
Sep 21, 2014
by
Serhiy Storchaka
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Issue #22423: Unhandled exception in thread no longer causes unhandled
AttributeError when sys.stderr is None.
parent
3f40c40d
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
94 additions
and
10 deletions
+94
-10
Lib/test/test_threading.py
Lib/test/test_threading.py
+83
-2
Lib/threading.py
Lib/threading.py
+8
-8
Misc/NEWS
Misc/NEWS
+3
-0
No files found.
Lib/test/test_threading.py
View file @
52005c2e
...
...
@@ -4,7 +4,7 @@ Tests for the threading module.
import
test.support
from
test.support
import
verbose
,
strip_python_stderr
,
import_module
,
cpython_only
from
test.script_helper
import
assert_python_ok
from
test.script_helper
import
assert_python_ok
,
assert_python_failure
import
random
import
re
...
...
@@ -15,7 +15,6 @@ import time
import
unittest
import
weakref
import
os
from
test.script_helper
import
assert_python_ok
,
assert_python_failure
import
subprocess
from
test
import
lock_tests
...
...
@@ -962,6 +961,88 @@ class ThreadingExceptionTests(BaseTestCase):
self
.
assertEqual
(
p
.
returncode
,
0
,
"Unexpected error: "
+
stderr
.
decode
())
self
.
assertEqual
(
data
,
expected_output
)
def
test_print_exception
(
self
):
script
=
r"""if True:
import threading
import time
running = False
def run():
global running
running = True
while running:
time.sleep(0.01)
1/0
t = threading.Thread(target=run)
t.start()
while not running:
time.sleep(0.01)
running = False
t.join()
"""
rc
,
out
,
err
=
assert_python_ok
(
"-c"
,
script
)
self
.
assertEqual
(
out
,
b''
)
err
=
err
.
decode
()
self
.
assertIn
(
"Exception in thread"
,
err
)
self
.
assertIn
(
"Traceback (most recent call last):"
,
err
)
self
.
assertIn
(
"ZeroDivisionError"
,
err
)
self
.
assertNotIn
(
"Unhandled exception"
,
err
)
def
test_print_exception_stderr_is_none_1
(
self
):
script
=
r"""if True:
import sys
import threading
import time
running = False
def run():
global running
running = True
while running:
time.sleep(0.01)
1/0
t = threading.Thread(target=run)
t.start()
while not running:
time.sleep(0.01)
sys.stderr = None
running = False
t.join()
"""
rc
,
out
,
err
=
assert_python_ok
(
"-c"
,
script
)
self
.
assertEqual
(
out
,
b''
)
err
=
err
.
decode
()
self
.
assertIn
(
"Exception in thread"
,
err
)
self
.
assertIn
(
"Traceback (most recent call last):"
,
err
)
self
.
assertIn
(
"ZeroDivisionError"
,
err
)
self
.
assertNotIn
(
"Unhandled exception"
,
err
)
def
test_print_exception_stderr_is_none_2
(
self
):
script
=
r"""if True:
import sys
import threading
import time
running = False
def run():
global running
running = True
while running:
time.sleep(0.01)
1/0
sys.stderr = None
t = threading.Thread(target=run)
t.start()
while not running:
time.sleep(0.01)
running = False
t.join()
"""
rc
,
out
,
err
=
assert_python_ok
(
"-c"
,
script
)
self
.
assertEqual
(
out
,
b''
)
self
.
assertNotIn
(
"Unhandled exception"
,
err
.
decode
())
class
TimerTests
(
BaseTestCase
):
def
setUp
(
self
):
...
...
Lib/threading.py
View file @
52005c2e
...
...
@@ -248,7 +248,7 @@ class Condition:
def
_is_owned
(
self
):
# Return True if lock is owned by current_thread.
# This method is called only if _
_
lock doesn't have _is_owned().
# This method is called only if _lock doesn't have _is_owned().
if
self
.
_lock
.
acquire
(
0
):
self
.
_lock
.
release
()
return
False
...
...
@@ -749,12 +749,12 @@ class Thread:
"""
_
_
initialized
=
False
_initialized
=
False
# Need to store a reference to sys.exc_info for printing
# out exceptions when a thread tries to use a global var. during interp.
# shutdown and thus raises an exception about trying to perform some
# operation on/with a NoneType
_
_
exc_info
=
_sys
.
exc_info
_exc_info
=
_sys
.
exc_info
# Keep sys.exc_clear too to clear the exception just before
# allowing .join() to return.
#XXX __exc_clear = _sys.exc_clear
...
...
@@ -926,10 +926,10 @@ class Thread:
# shutdown) use self._stderr. Otherwise still use sys (as in
# _sys) in case sys.stderr was redefined since the creation of
# self.
if
_sys
:
_sys
.
stderr
.
write
(
"Exception in thread %s:
\
n
%s
\
n
"
%
(
self
.
name
,
_format_exc
())
)
el
s
e
:
if
_sys
and
_sys
.
stderr
is
not
None
:
print
(
"Exception in thread %s:
\
n
%s
"
%
(
self
.
name
,
_format_exc
()),
file
=
self
.
_stderr
)
el
if
self
.
_stderr
is
not
Non
e
:
# Do the best job possible w/o a huge amt. of code to
# approximate a traceback (code ideas from
# Lib/traceback.py)
...
...
@@ -957,7 +957,7 @@ class Thread:
# test_threading.test_no_refcycle_through_target when
# the exception keeps the target alive past when we
# assert that it's dead.
#XXX self._
_
exc_clear()
#XXX self._exc_clear()
pass
finally
:
with
_active_limbo_lock
:
...
...
Misc/NEWS
View file @
52005c2e
...
...
@@ -32,6 +32,9 @@ Core and Builtins
Library
-------
- Issue #22423: Unhandled exception in thread no longer causes unhandled
AttributeError when sys.stderr is None.
- Issue #21091: Fix API bug: email.message.EmailMessage.is_attachment is now
a method. Since EmailMessage is provisional, we can change the API in a
maintenance release, but we use a trick to remain backward compatible with
...
...
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