summaryrefslogtreecommitdiffstats
path: root/Lib/test/test_threading.py
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2011-05-31 00:25:43 (GMT)
committerBenjamin Peterson <benjamin@python.org>2011-05-31 00:25:43 (GMT)
commitcccfd9932dcbf808ca3b3e2c494799dfab4ae074 (patch)
tree287d56155899a1cd0b7f68eb581e792ee3e4b792 /Lib/test/test_threading.py
parent15ac3110883c7f6e5cde5dd308baf178e666b985 (diff)
parent1eb6d278a8139dda25efbe1b3509aac159bc54fd (diff)
downloadcpython-cccfd9932dcbf808ca3b3e2c494799dfab4ae074.zip
cpython-cccfd9932dcbf808ca3b3e2c494799dfab4ae074.tar.gz
cpython-cccfd9932dcbf808ca3b3e2c494799dfab4ae074.tar.bz2
merge heads
Diffstat (limited to 'Lib/test/test_threading.py')
-rw-r--r--Lib/test/test_threading.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/test/test_threading.py b/Lib/test/test_threading.py
index c22d965..12e596e 100644
--- a/Lib/test/test_threading.py
+++ b/Lib/test/test_threading.py
@@ -173,7 +173,7 @@ class ThreadTests(BaseTestCase):
exception = ctypes.py_object(AsyncExc)
# First check it works when setting the exception from the same thread.
- tid = _thread.get_ident()
+ tid = threading.get_ident()
try:
result = set_async_exc(ctypes.c_long(tid), exception)
@@ -202,7 +202,7 @@ class ThreadTests(BaseTestCase):
class Worker(threading.Thread):
def run(self):
- self.id = _thread.get_ident()
+ self.id = threading.get_ident()
self.finished = False
try: