diff options
| author | Brett Cannon <brett@python.org> | 2021-04-03 22:31:15 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-03 22:31:15 (GMT) |
| commit | dc6d3e1e4c0c1e4b2210edab8fb4762569dc2936 (patch) | |
| tree | 80ae8d9059b68a4803a02c7269dba190f7596678 /Lib | |
| parent | c5354c045c1067549554c35485a12afdcf88a202 (diff) | |
| download | cpython-dc6d3e1e4c0c1e4b2210edab8fb4762569dc2936.zip cpython-dc6d3e1e4c0c1e4b2210edab8fb4762569dc2936.tar.gz cpython-dc6d3e1e4c0c1e4b2210edab8fb4762569dc2936.tar.bz2 | |
bpo-43720: Update import-related stdlib deprecation messages to say they will be removed in Python 3.12 (GH-25167)
Diffstat (limited to 'Lib')
| -rw-r--r-- | Lib/imp.py | 3 | ||||
| -rw-r--r-- | Lib/importlib/util.py | 9 | ||||
| -rw-r--r-- | Lib/pkgutil.py | 6 | ||||
| -rw-r--r-- | Lib/test/test_pkgutil.py | 3 |
4 files changed, 14 insertions, 7 deletions
@@ -28,7 +28,8 @@ import tokenize import types import warnings -warnings.warn("the imp module is deprecated in favour of importlib; " +warnings.warn("the imp module is deprecated in favour of importlib and slated " + "for removal in Python 3.12; " "see the module's documentation for alternative uses", DeprecationWarning, stacklevel=2) diff --git a/Lib/importlib/util.py b/Lib/importlib/util.py index 98a0fa5..8623c89 100644 --- a/Lib/importlib/util.py +++ b/Lib/importlib/util.py @@ -149,7 +149,8 @@ def set_package(fxn): """ @functools.wraps(fxn) def set_package_wrapper(*args, **kwargs): - warnings.warn('The import system now takes care of this automatically.', + warnings.warn('The import system now takes care of this automatically; ' + 'this decorator is slated for removal in Python 3.12', DeprecationWarning, stacklevel=2) module = fxn(*args, **kwargs) if getattr(module, '__package__', None) is None: @@ -168,7 +169,8 @@ def set_loader(fxn): """ @functools.wraps(fxn) def set_loader_wrapper(self, *args, **kwargs): - warnings.warn('The import system now takes care of this automatically.', + warnings.warn('The import system now takes care of this automatically; ' + 'this decorator is slated for removal in Python 3.12', DeprecationWarning, stacklevel=2) module = fxn(self, *args, **kwargs) if getattr(module, '__loader__', None) is None: @@ -195,7 +197,8 @@ def module_for_loader(fxn): the second argument. """ - warnings.warn('The import system now takes care of this automatically.', + warnings.warn('The import system now takes care of this automatically; ' + 'this decorator is slated for removal in Python 3.12', DeprecationWarning, stacklevel=2) @functools.wraps(fxn) def module_for_loader_wrapper(self, fullname, *args, **kwargs): diff --git a/Lib/pkgutil.py b/Lib/pkgutil.py index 3d7f19f..2c34298 100644 --- a/Lib/pkgutil.py +++ b/Lib/pkgutil.py @@ -204,7 +204,8 @@ class ImpImporter: def __init__(self, path=None): global imp - warnings.warn("This emulation is deprecated, use 'importlib' instead", + warnings.warn("This emulation is deprecated and slated for removal " + "in Python 3.12; use 'importlib' instead", DeprecationWarning) _import_imp() self.path = path @@ -271,7 +272,8 @@ class ImpLoader: code = source = None def __init__(self, fullname, file, filename, etc): - warnings.warn("This emulation is deprecated, use 'importlib' instead", + warnings.warn("This emulation is deprecated and slated for removal in " + "Python 3.12; use 'importlib' instead", DeprecationWarning) _import_imp() self.file = file diff --git a/Lib/test/test_pkgutil.py b/Lib/test/test_pkgutil.py index bf9722a..6e3618f 100644 --- a/Lib/test/test_pkgutil.py +++ b/Lib/test/test_pkgutil.py @@ -498,7 +498,8 @@ class ImportlibMigrationTests(unittest.TestCase): def check_deprecated(self): return check_warnings( - ("This emulation is deprecated, use 'importlib' instead", + ("This emulation is deprecated and slated for removal in " + "Python 3.12; use 'importlib' instead", DeprecationWarning)) def test_importer_deprecated(self): |