mirror of
https://github.com/python/cpython.git
synced 2025-09-26 10:19:53 +00:00
Issue #13959: Deprecate imp.get_suffixes() for new attributes on
importlib.machinery that provide the suffix details for import. The attributes were not put on imp so as to compartmentalize everything importlib needs for setting up imports in importlib.machinery. This also led to an indirect deprecation of inspect.getmoduleinfo() as it directly returned imp.get_suffix's returned tuple which no longer makes sense.
This commit is contained in:
parent
810c64df8f
commit
cb66eb0dec
17 changed files with 160 additions and 69 deletions
|
@ -1,5 +1,6 @@
|
|||
"""Test case-sensitivity (PEP 235)."""
|
||||
from importlib import _bootstrap
|
||||
from importlib import machinery
|
||||
from .. import util
|
||||
from . import util as source_util
|
||||
import imp
|
||||
|
@ -20,12 +21,12 @@ class CaseSensitivityTest(unittest.TestCase):
|
|||
assert name != name.lower()
|
||||
|
||||
def find(self, path):
|
||||
finder = _bootstrap.FileFinder(path,
|
||||
(_bootstrap.SourceFileLoader,
|
||||
_bootstrap._SOURCE_SUFFIXES,
|
||||
finder = machinery.FileFinder(path,
|
||||
(machinery.SourceFileLoader,
|
||||
machinery.SOURCE_SUFFIXES,
|
||||
True),
|
||||
(_bootstrap.SourcelessFileLoader,
|
||||
[_bootstrap._BYTECODE_SUFFIX],
|
||||
(machinery.SourcelessFileLoader,
|
||||
machinery.BYTECODE_SUFFIXES,
|
||||
True))
|
||||
return finder.find_module(self.name)
|
||||
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
from .. import abc
|
||||
from . import util as source_util
|
||||
|
||||
from importlib import _bootstrap
|
||||
from importlib import machinery
|
||||
import errno
|
||||
import imp
|
||||
import os
|
||||
|
@ -36,11 +36,11 @@ class FinderTests(abc.FinderTests):
|
|||
"""
|
||||
|
||||
def import_(self, root, module):
|
||||
loader_details = [(_bootstrap.SourceFileLoader,
|
||||
_bootstrap._SOURCE_SUFFIXES, True),
|
||||
(_bootstrap.SourcelessFileLoader,
|
||||
[_bootstrap._BYTECODE_SUFFIX], True)]
|
||||
finder = _bootstrap.FileFinder(root, *loader_details)
|
||||
loader_details = [(machinery.SourceFileLoader,
|
||||
machinery.SOURCE_SUFFIXES, True),
|
||||
(machinery.SourcelessFileLoader,
|
||||
machinery.BYTECODE_SUFFIXES, True)]
|
||||
finder = machinery.FileFinder(root, *loader_details)
|
||||
return finder.find_module(module)
|
||||
|
||||
def run_test(self, test, create=None, *, compile_=None, unlink=None):
|
||||
|
@ -138,8 +138,8 @@ class FinderTests(abc.FinderTests):
|
|||
|
||||
def test_empty_string_for_dir(self):
|
||||
# The empty string from sys.path means to search in the cwd.
|
||||
finder = _bootstrap.FileFinder('', (_bootstrap.SourceFileLoader,
|
||||
_bootstrap._SOURCE_SUFFIXES, True))
|
||||
finder = machinery.FileFinder('', (machinery.SourceFileLoader,
|
||||
machinery.SOURCE_SUFFIXES, True))
|
||||
with open('mod.py', 'w') as file:
|
||||
file.write("# test file for importlib")
|
||||
try:
|
||||
|
@ -150,8 +150,8 @@ class FinderTests(abc.FinderTests):
|
|||
|
||||
def test_invalidate_caches(self):
|
||||
# invalidate_caches() should reset the mtime.
|
||||
finder = _bootstrap.FileFinder('', (_bootstrap.SourceFileLoader,
|
||||
_bootstrap._SOURCE_SUFFIXES, True))
|
||||
finder = machinery.FileFinder('', (machinery.SourceFileLoader,
|
||||
machinery.SOURCE_SUFFIXES, True))
|
||||
finder._path_mtime = 42
|
||||
finder.invalidate_caches()
|
||||
self.assertEqual(finder._path_mtime, -1)
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
from . import util as source_util
|
||||
|
||||
from importlib import _bootstrap
|
||||
from importlib import machinery
|
||||
import imp
|
||||
import unittest
|
||||
|
||||
|
@ -10,8 +10,8 @@ class PathHookTest(unittest.TestCase):
|
|||
"""Test the path hook for source."""
|
||||
|
||||
def path_hook(self):
|
||||
return _bootstrap.FileFinder.path_hook((_bootstrap.SourceFileLoader,
|
||||
_bootstrap._SOURCE_SUFFIXES, True))
|
||||
return machinery.FileFinder.path_hook((machinery.SourceFileLoader,
|
||||
machinery.SOURCE_SUFFIXES, True))
|
||||
|
||||
def test_success(self):
|
||||
with source_util.create_modules('dummy') as mapping:
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue