Merged revisions 65824 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r65824 | benjamin.peterson | 2008-08-18 13:01:43 -0500 (Mon, 18 Aug 2008) | 1 line

  change a few uses of the threading APIs
........

diff --git a/Lib/logging/__init__.py b/Lib/logging/__init__.py
index 9727d4f091afcd259533ede9e3dfd7abf42359b7..bd6c7f26de98d764852f57133135dc0f6a669442 100644 (file)
--- a/Lib/logging/__init__.py
+++ b/Lib/logging/__init__.py
@@ -258,7 +258,7 @@ class LogRecord:
         self.relativeCreated = (self.created - _startTime) * 1000
         if logThreads and thread:
             self.thread = thread.get_ident()
-            self.threadName = threading.current_thread().get_name()
+            self.threadName = threading.current_thread().name
         else:
             self.thread = None
             self.threadName = None

diff --git a/Lib/multiprocessing/managers.py b/Lib/multiprocessing/managers.py
index a460edc83df0896ea5c20a366b3e438d30e3f2f9..1fc7d6aa75215bfb1bfb087b1310c217560bb6da 100644 (file)
--- a/Lib/multiprocessing/managers.py
+++ b/Lib/multiprocessing/managers.py
@@ -207,7 +207,7 @@ class Server(object):
         Handle requests from the proxies in a particular process/thread
         '''
         util.debug('starting server thread to service %r',
-                   threading.current_thread().get_name())
+                   threading.current_thread().name)
 
         recv = conn.recv
         send = conn.send
@@ -257,7 +257,7 @@ class Server(object):
 
             except EOFError:
                 util.debug('got EOF -- exiting thread serving %r',
-                           threading.current_thread().get_name())
+                           threading.current_thread().name)
                 sys.exit(0)
 
             except Exception:
@@ -270,7 +270,7 @@ class Server(object):
                     send(('#UNSERIALIZABLE', repr(msg)))
             except Exception as e:
                 util.info('exception in thread serving %r',
-                        threading.current_thread().get_name())
+                        threading.current_thread().name)
                 util.info(' ... message was %r', msg)
                 util.info(' ... exception was %r', e)
                 conn.close()
@@ -392,7 +392,7 @@ class Server(object):
         '''
         Spawn a new thread to serve this connection
         '''
-        threading.current_thread().set_name(name)
+        threading.current_thread().name = name
         c.send(('#RETURN', None))
         self.serve_client(c)
 
@@ -706,8 +706,8 @@ class BaseProxy(object):
     def _connect(self):
         util.debug('making connection to manager')
         name = current_process().get_name()
-        if threading.current_thread().get_name() != 'MainThread':
-            name += '|' + threading.current_thread().get_name()
+        if threading.current_thread().name != 'MainThread':
+            name += '|' + threading.current_thread().name
         conn = self._Client(self._token.address, authkey=self._authkey)
         dispatch(conn, None, 'accept_connection', (name,))
         self._tls.connection = conn
@@ -720,7 +720,7 @@ class BaseProxy(object):
             conn = self._tls.connection
         except AttributeError:
             util.debug('thread %r does not own a connection',
-                       threading.current_thread().get_name())
+                       threading.current_thread().name)
             self._connect()
             conn = self._tls.connection
 
@@ -781,7 +781,7 @@ class BaseProxy(object):
         # the process owns no more references to objects for this manager
         if not idset and hasattr(tls, 'connection'):
             util.debug('thread %r has no more proxies so closing conn',
-                       threading.current_thread().get_name())
+                       threading.current_thread().name)
             tls.connection.close()
             del tls.connection
 

diff --git a/Lib/multiprocessing/queues.py b/Lib/multiprocessing/queues.py
index 1c32dde647dd3b98da6270eefd17cef1ebaa627f..dce3aa63877af3337c04c345cc6f0cae382901d7 100644 (file)
--- a/Lib/multiprocessing/queues.py
+++ b/Lib/multiprocessing/queues.py
@@ -155,7 +155,7 @@ class Queue(object):
                   self._wlock, self._writer.close),
             name='QueueFeederThread'
             )
-        self._thread.set_daemon(True)
+        self._thread.daemon = True
 
         debug('doing self._thread.start()')
         self._thread.start()

diff --git a/Lib/test/test_dummy_threading.py b/Lib/test/test_dummy_threading.py
index 86b3f3588cc1be1e319385d240ff8e759e1ca107..6ec5da3835aea6613d4c13d0e13cb56248ef454b 100644 (file)
--- a/Lib/test/test_dummy_threading.py
+++ b/Lib/test/test_dummy_threading.py
@@ -16,7 +16,7 @@ class DummyThreadingTestCase(unittest.TestCase):
             #delay = random.random() * 2
             delay = 0
             if support.verbose:
-                print('task', self.get_name(), 'will run for', delay, 'sec')
+                print('task', self.name, 'will run for', delay, 'sec')
             sema.acquire()
             mutex.acquire()
             running += 1
@@ -25,11 +25,11 @@ class DummyThreadingTestCase(unittest.TestCase):
             mutex.release()
             time.sleep(delay)
             if support.verbose:
-                print('task', self.get_name(), 'done')
+                print('task', self.name, 'done')
             mutex.acquire()
             running -= 1
             if support.verbose:
-                print(self.get_name(), 'is finished.', running, 'tasks are running')
+                print(self.name, 'is finished.', running, 'tasks are running')
             mutex.release()
             sema.release()
 

diff --git a/Lib/test/test_multiprocessing.py b/Lib/test/test_multiprocessing.py
index 078d7faf3bacafc5b261318235269c47d1b49ee4..5c1064a8a32d8a1d12933b9f356a49dcac1413f3 100644 (file)
--- a/Lib/test/test_multiprocessing.py
+++ b/Lib/test/test_multiprocessing.py
@@ -671,7 +671,7 @@ class _TestCondition(BaseTestCase):
 
             t = threading.Thread(target=self.f,
                                  args=(cond, sleeping, woken, TIMEOUT1))
-            t.set_daemon(True)
+            t.daemon = True
             t.start()
 
         # wait for them all to sleep
@@ -693,7 +693,7 @@ class _TestCondition(BaseTestCase):
             p.start()
 
             t = threading.Thread(target=self.f, args=(cond, sleeping, woken))
-            t.set_daemon(True)
+            t.daemon = True
             t.start()
 
         # wait for them to all sleep

diff --git a/Lib/test/test_socketserver.py b/Lib/test/test_socketserver.py
index 2427b8f3b95349329b4a15578f2e97932bde3bd5..4ffea57e996650387d6e752b1df708f377b62bf8 100644 (file)
--- a/Lib/test/test_socketserver.py
+++ b/Lib/test/test_socketserver.py
@@ -139,7 +139,7 @@ class SocketServerTest(unittest.TestCase):
             # Time between requests is short enough that we won't wake
             # up spuriously too many times.
             kwargs={'poll_interval':0.01})
-        t.set_daemon(True)  # In case this function raises.
+        t.daemon = True  # In case this function raises.
         t.start()
         if verbose: print("server running")
         for i in range(3):