commit 727537077043bb03a0c9e537cacbb9e695f7f4a8
author Benjamin Peterson <benjamin@python.org> Mon Aug 18 18:09:21 2008 +0000
committer Benjamin Peterson <benjamin@python.org> Mon Aug 18 18:09:21 2008 +0000
tree 7f6062facaa5dda6a57383ffe1a7d7cd6a91f703
parent c16a7f3684290ddda130811912ae08a098df3d74

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
........

Lib/test/test_dummy_threading.py

diff --git a/Lib/test/test_dummy_threading.py b/Lib/test/test_dummy_threading.py
index 86b3f35..6ec5da3 100644
--- a/Lib/test/test_dummy_threading.py
+++ b/Lib/test/test_dummy_threading.py
@@ -16,7 +16,7 @@
             #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 @@
             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()
 

Lib/test/test_multiprocessing.py

diff --git a/Lib/test/test_multiprocessing.py b/Lib/test/test_multiprocessing.py
index 078d7fa..5c1064a 100644
--- a/Lib/test/test_multiprocessing.py
+++ b/Lib/test/test_multiprocessing.py
@@ -671,7 +671,7 @@
 
             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 @@
             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

Lib/test/test_socketserver.py

diff --git a/Lib/test/test_socketserver.py b/Lib/test/test_socketserver.py
index 2427b8f..4ffea57 100644
--- a/Lib/test/test_socketserver.py
+++ b/Lib/test/test_socketserver.py
@@ -139,7 +139,7 @@
             # 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):