From: Antoine Pitrou <solipsis@pitrou.net>
Date: Wed, 4 Aug 2010 00:19:35 +0000 (+0000)
Subject: Merged revisions 83696 via svnmerge from
X-Git-Tag: v3.1.3rc1~396
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9b3383ca65fc0181e3b7a6aacae3539de545591f;p=python

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

diff --git a/Lib/test/test_threading_local.py b/Lib/test/test_threading_local.py
index 2b896ff813..84523ad37e 100644
--- a/Lib/test/test_threading_local.py
+++ b/Lib/test/test_threading_local.py
@@ -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)