mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-03 16:39:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Issue #20526, #19466: Revert changes of issue #19466 which introduces a

Browse source 
regression: don't clear anymore the state of Python threads early during the
Python shutdown.
This commit is contained in:
Victor Stinner 2014-02-13 12:48:54 +01:00
parent e755fba2d1
commit 15054c16c8
3 changed files with 9 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

49
Lib/test/test_threading.py
View file

@ -616,51 +616,6 @@ class ThreadTests(BaseTestCase):
t.join()
self.assertRaises(ValueError, bs.release)
def test_locals_at_exit(self):
# Issue #19466: thread locals must not be deleted before destructors
# are called
rc, out, err = assert_python_ok("-c", """if 1:
import threading
class Atexit:
def __del__(self):
print("thread_dict.atexit = %r" % thread_dict.atexit)
thread_dict = threading.local()
thread_dict.atexit = "atexit"
atexit = Atexit()
""")
self.assertEqual(out.rstrip(), b"thread_dict.atexit = 'atexit'")
def test_warnings_at_exit(self):
# Issue #19466: try to call most destructors at Python shutdown before
# destroying Python thread states
filename = __file__
rc, out, err = assert_python_ok("-Wd", "-c", """if 1:
import time
import threading
def open_sleep():
# a warning will be emitted when the open file will be
# destroyed (without being explicitly closed) while the daemon
# thread is destroyed
fileobj = open(%a, 'rb')
start_event.set()
time.sleep(60.0)
start_event = threading.Event()
thread = threading.Thread(target=open_sleep)
thread.daemon = True
thread.start()
# wait until the thread started
start_event.wait()
""" % filename)
self.assertRegex(err.rstrip(),
b"^sys:1: ResourceWarning: unclosed file ")
@cpython_only
def test_frame_tstate_tracing(self):
# Issue #14432: Crash when a generator is created in a C thread that is
@ -786,10 +741,6 @@ class ThreadJoinOnShutdown(BaseTestCase):
import sys
import time
import threading
import warnings
# ignore "unclosed file ..." warnings
warnings.filterwarnings('ignore', '', ResourceWarning)
thread_has_run = set()