[Python-checkins] cpython: Try to fix issue #19134 again

[brett.cannon]

http://hg.python.org/cpython/rev/2e54edaf60d4
changeset:   85925:2e54edaf60d4
user:        Brett Cannon <brett at python.org>
date:        Wed Oct 02 10:25:42 2013 -0400
summary:
  Try to fix issue #19134 again

files:
  Lib/test/test_inspect.py |  11 ++++++-----
  1 files changed, 6 insertions(+), 5 deletions(-)


diff --git a/Lib/test/test_inspect.py b/Lib/test/test_inspect.py
--- a/Lib/test/test_inspect.py
+++ b/Lib/test/test_inspect.py
@@ -11,9 +11,12 @@
 import functools
 import importlib
 from os.path import normcase
+try:
+    from concurrent.futures import ThreadPoolExecutor
+except ImportError:
+    ThreadPoolExecutor = None
 
 from test.support import run_unittest, TESTFN, DirsOnSysPath
-from test.support import multiprocessing as has_multiprocessing
 from test.script_helper import assert_python_ok, assert_python_failure
 from test import inspect_fodder as mod
 from test import inspect_fodder2 as mod2
@@ -2408,17 +2411,15 @@
         self.assertEqual(lines[:-1], inspect.getsource(module).splitlines())
         self.assertEqual(err, b'')
 
-    @unittest.skipIf(not has_multiprocessing,
+    @unittest.skipIf(ThreadPoolExecutor is None,
             'multiprocessing required to test __qualname__ for source files')
     def test_qualname_source(self):
-        module = importlib.import_module('concurrent.futures')
-        member = getattr(module, 'ThreadPoolExecutor')
         rc, out, err = assert_python_ok('-m', 'inspect',
                                      'concurrent.futures:ThreadPoolExecutor')
         lines = out.decode().splitlines()
         # ignore the final newline
         self.assertEqual(lines[:-1],
-                         inspect.getsource(member).splitlines())
+                         inspect.getsource(ThreadPoolExecutor).splitlines())
         self.assertEqual(err, b'')
 
     def test_builtins(self):

-- 
Repository URL: http://hg.python.org/cpython