mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-28 21:55:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

backport threading property changes

Browse source
This commit is contained in:
Benjamin Peterson 2008-08-18 17:45:09 +00:00
parent d8a8972ca9
commit cbae869759
2 changed files with 18 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Lib/test/test_threading.py
View file

@ -34,7 +34,7 @@ class TestThread(threading.Thread):
delay = random.random() / 10000.0 delay = random.random() / 10000.0
if verbose: if verbose:
print 'task %s will run for %.1f usec' % ( print 'task %s will run for %.1f usec' % (
self.get_name(), delay * 1e6) self.name, delay * 1e6)
with self.sema: with self.sema:
with self.mutex: with self.mutex:
@ -45,14 +45,14 @@ class TestThread(threading.Thread):
time.sleep(delay) time.sleep(delay)
if verbose: if verbose:
print 'task', self.get_name(), 'done' print 'task', self.name, 'done'
with self.mutex: with self.mutex:
self.nrunning.dec() self.nrunning.dec()
self.testcase.assert_(self.nrunning.get() >= 0) self.testcase.assert_(self.nrunning.get() >= 0)
if verbose: if verbose:
print '%s is finished. %d tasks are running' % ( print '%s is finished. %d tasks are running' % (
self.get_name(), self.nrunning.get()) self.name, self.nrunning.get())
class ThreadTests(unittest.TestCase): class ThreadTests(unittest.TestCase):
@ -172,7 +172,7 @@ class ThreadTests(unittest.TestCase):
worker_saw_exception.set() worker_saw_exception.set()
t = Worker() t = Worker()
t.set_daemon(True) # so if this fails, we don't hang Python at shutdown t.daemon = True # so if this fails, we don't hang Python at shutdown
t.start() t.start()
if verbose: if verbose:
print " started worker thread" print " started worker thread"
@ -258,7 +258,7 @@ class ThreadTests(unittest.TestCase):
print 'program blocked; aborting' print 'program blocked; aborting'
os._exit(2) os._exit(2)
t = threading.Thread(target=killer) t = threading.Thread(target=killer)
t.set_daemon(True) t.daemon = True
t.start() t.start()
# This is the trace function # This is the trace function
@ -435,7 +435,7 @@ class ThreadingExceptionTests(unittest.TestCase):
def test_daemonize_active_thread(self): def test_daemonize_active_thread(self):
thread = threading.Thread() thread = threading.Thread()
thread.start() thread.start()
self.assertRaises(RuntimeError, thread.set_daemon, True) self.assertRaises(RuntimeError, setattr, thread, "daemon", True)
def test_main(): def test_main():

30
Lib/threading.py
View file

@ -445,7 +445,7 @@ class Thread(_Verbose):
def _set_daemon(self): def _set_daemon(self):
# Overridden in _MainThread and _DummyThread # Overridden in _MainThread and _DummyThread
return current_thread().is_daemon() return current_thread().daemon
def __repr__(self): def __repr__(self):
assert self.__initialized, "Thread.__init__() was not called" assert self.__initialized, "Thread.__init__() was not called"
@ -651,18 +651,16 @@ class Thread(_Verbose):
finally: finally:
self.__block.release() self.__block.release()
def get_name(self): @property
def name(self):
assert self.__initialized, "Thread.__init__() not called" assert self.__initialized, "Thread.__init__() not called"
return self.__name return self.__name
getName = _old_api(get_name, "getName") @name.setter
def name(self, name):
def set_name(self, name):
assert self.__initialized, "Thread.__init__() not called" assert self.__initialized, "Thread.__init__() not called"
self.__name = str(name) self.__name = str(name)
setName = _old_api(set_name, "setName")
@property @property
def ident(self): def ident(self):
assert self.__initialized, "Thread.__init__() not called" assert self.__initialized, "Thread.__init__() not called"
@ -672,23 +670,19 @@ class Thread(_Verbose):
assert self.__initialized, "Thread.__init__() not called" assert self.__initialized, "Thread.__init__() not called"
return self.__started.is_set() and not self.__stopped return self.__started.is_set() and not self.__stopped
isAlive = _old_api(is_alive, "isAlive") @property
def daemon(self):
def is_daemon(self):
assert self.__initialized, "Thread.__init__() not called" assert self.__initialized, "Thread.__init__() not called"
return self.__daemonic return self.__daemonic
isDaemon = _old_api(is_daemon, "isDaemon") @daemon.setter
def daemon(self, daemonic):
def set_daemon(self, daemonic):
if not self.__initialized: if not self.__initialized:
raise RuntimeError("Thread.__init__() not called") raise RuntimeError("Thread.__init__() not called")
if self.__started.is_set(): if self.__started.is_set():
raise RuntimeError("cannot set daemon status of active thread"); raise RuntimeError("cannot set daemon status of active thread");
self.__daemonic = daemonic self.__daemonic = daemonic
setDaemon = _old_api(set_daemon, "setDaemon")
# The timer class was contributed by Itamar Shtull-Trauring # The timer class was contributed by Itamar Shtull-Trauring
def Timer(*args, **kwargs): def Timer(*args, **kwargs):
@ -750,7 +744,7 @@ class _MainThread(Thread):
def _pickSomeNonDaemonThread(): def _pickSomeNonDaemonThread():
for t in enumerate(): for t in enumerate():
if not t.is_daemon() and t.is_alive(): if not t.daemon and t.is_alive():
return t return t
return None return None
@ -906,7 +900,7 @@ def _test():
counter = 0 counter = 0
while counter < self.quota: while counter < self.quota:
counter = counter + 1 counter = counter + 1
self.queue.put("%s.%d" % (self.get_name(), counter)) self.queue.put("%s.%d" % (self.name, counter))
_sleep(random() * 0.00001) _sleep(random() * 0.00001)
@ -931,7 +925,7 @@ def _test():
P = [] P = []
for i in range(NP): for i in range(NP):
t = ProducerThread(Q, NI) t = ProducerThread(Q, NI)
t.setName("Producer-%d" % (i+1)) t.name = ("Producer-%d" % (i+1))
P.append(t) P.append(t)
C = ConsumerThread(Q, NI*NP) C = ConsumerThread(Q, NI*NP)
for t in P: for t in P: