Commit 9b3383ca authored by Antoine Pitrou's avatar Antoine Pitrou

Merged revisions 83696 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r83696 | antoine.pitrou | 2010-08-04 02:18:49 +0200 (mer., 04 août 2010) | 3 lines

  That test was never run (since thread has been renamed to _thread in 3.x)
........
parent e06528c6
......@@ -126,20 +126,14 @@ def test_main():
suite.addTest(unittest.makeSuite(ThreadLocalTest))
suite.addTest(unittest.makeSuite(PyThreadingLocalTest))
try:
from thread import _local
except ImportError:
pass
else:
import _threading_local
local_orig = _threading_local.local
def setUp(test):
_threading_local.local = _local
def tearDown(test):
_threading_local.local = local_orig
suite.addTest(DocTestSuite('_threading_local',
setUp=setUp, tearDown=tearDown)
)
local_orig = _threading_local.local
def setUp(test):
_threading_local.local = _thread._local
def tearDown(test):
_threading_local.local = local_orig
suite.addTest(DocTestSuite('_threading_local',
setUp=setUp, tearDown=tearDown)
)
support.run_unittest(suite)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment