From 634a8fc04276d8215973589d736c8fd372d91b92 Mon Sep 17 00:00:00 2001 From: Brett Cannon Date: Wed, 2 Oct 2013 10:25:42 -0400 Subject: [PATCH] Try to fix issue #19134 again --- Lib/test/test_inspect.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/Lib/test/test_inspect.py b/Lib/test/test_inspect.py index 45b36d22ff..2b7ba15ed3 100644 --- a/Lib/test/test_inspect.py +++ b/Lib/test/test_inspect.py @@ -11,9 +11,12 @@ import shutil 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 @@ class TestMain(unittest.TestCase): 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): -- 2.50.0