mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-14 12:46:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 12

Issue #19704: Port test.test_threaded_import to PEP 451

Browse source
This commit is contained in:
Brett Cannon 2013-12-13 16:47:19 -05:00
parent 706a7296d7
commit c091a5762e
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Lib/test/test_threaded_import.py
View file

@ -57,7 +57,7 @@ circular_imports_modules = {
} }
class Finder: class Finder:
"""A dummy finder to detect concurrent access to its find_module() """A dummy finder to detect concurrent access to its find_spec()
method.""" method."""
def __init__(self): def __init__(self):
@ -65,8 +65,8 @@ class Finder:
self.x = 0 self.x = 0
self.lock = threading.Lock() self.lock = threading.Lock()
def find_module(self, name, path=None): def find_spec(self, name, path=None, target=None):
# Simulate some thread-unsafe behaviour. If calls to find_module() # Simulate some thread-unsafe behaviour. If calls to find_spec()
# are properly serialized, `x` will end up the same as `numcalls`. # are properly serialized, `x` will end up the same as `numcalls`.
# Otherwise not. # Otherwise not.
assert imp.lock_held() assert imp.lock_held()
@ -80,7 +80,7 @@ class FlushingFinder:
"""A dummy finder which flushes sys.path_importer_cache when it gets """A dummy finder which flushes sys.path_importer_cache when it gets
called.""" called."""
def find_module(self, name, path=None): def find_spec(self, name, path=None, target=None):
sys.path_importer_cache.clear() sys.path_importer_cache.clear()
@ -145,13 +145,13 @@ class ThreadedImportTests(unittest.TestCase):
# dedicated meta_path entry. # dedicated meta_path entry.
flushing_finder = FlushingFinder() flushing_finder = FlushingFinder()
def path_hook(path): def path_hook(path):
finder.find_module('') finder.find_spec('')
raise ImportError raise ImportError
sys.path_hooks.insert(0, path_hook) sys.path_hooks.insert(0, path_hook)
sys.meta_path.append(flushing_finder) sys.meta_path.append(flushing_finder)
try: try:
# Flush the cache a first time # Flush the cache a first time
flushing_finder.find_module('') flushing_finder.find_spec('')
numtests = self.check_parallel_module_init() numtests = self.check_parallel_module_init()
self.assertGreater(finder.numcalls, 0) self.assertGreater(finder.numcalls, 0)
self.assertEqual(finder.x, finder.numcalls) self.assertEqual(finder.x, finder.numcalls)