Thanks to visit codestin.com
Credit goes to github.com

Skip to content

gh-121604: Make sure all deprecated items in importlib raise DeprecationWarning #128007

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 15 commits into from
Jan 15, 2025
Merged

gh-121604: Make sure all deprecated items in importlib raise DeprecationWarning #128007

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
d4844c5
Add DeprecationWarning for path_mtime
tomasr8 Dec 15, 2024
cbe54a3
Add DeprecationWarning for ResourceLoader
tomasr8 Dec 15, 2024
b73ad85
Add DeprecationWarning for DEBUG_BYTECODE_SUFFIXES and OPTIMIZED_BYTE…
tomasr8 Dec 15, 2024
5375cf6
Add DeprecationWarning for WindowsRegistryFinder
tomasr8 Dec 15, 2024
3306e7e
Update tests
tomasr8 Dec 16, 2024
5c7c5e9
Add news entry
tomasr8 Dec 16, 2024
7079bdd
Unify quotes
tomasr8 Dec 16, 2024
651e40e
Update Lib/importlib/abc.py
tomasr8 Dec 16, 2024
df86fcf
Fix tests
tomasr8 Dec 16, 2024
a22637b
Improve deprecation message
tomasr8 Jan 7, 2025
60d20c0
Raise DeprecationWarning in find_spec instead of __init__
tomasr8 Jan 7, 2025
f3faa95
Remove extra import
tomasr8 Jan 7, 2025
5fa376c
Align code
tomasr8 Jan 7, 2025
2b3e9d2
Merge branch 'main' into importlib-deprecations
brettcannon Jan 14, 2025
adccc7d
Update news entry to be more specific about what's deprecated
brettcannon Jan 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Raise DeprecationWarning in find_spec instead of __init__
  • Loading branch information
@tomasr8
tomasr8 committed Jan 7, 2025
commit 60d20c047032bd6da77c31d0fcc6e1edfa485e2e
15 changes: 7 additions & 8 deletions Lib/importlib/_bootstrap_external.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -692,14 +692,6 @@ class WindowsRegistryFinder:
'\\Modules\\{fullname}\\Debug')
DEBUG_BUILD = (_MS_WINDOWS and '_d.pyd' in EXTENSION_SUFFIXES)

def __init__(self):
import warnings
warnings.warn('importlib.machinery.WindowsRegistryFinder is '
'deprecated. Use site configuration instead. '
'Future versions of Python may not enable this '
'finder by default.',
DeprecationWarning, stacklevel=2)

@staticmethod
def _open_registry(key):
try:
Expand All @@ -724,6 +716,13 @@ def _search_registry(cls, fullname):

@classmethod
def find_spec(cls, fullname, path=None, target=None):
import warnings
warnings.warn('importlib.machinery.WindowsRegistryFinder is '
'deprecated; use site configuration instead. '
'Future versions of Python may not enable this '
'finder by default.',
DeprecationWarning, stacklevel=2)

filepath = cls._search_registry(fullname)
if filepath is None:
return None
Expand Down
5 changes: 0 additions & 5 deletions Lib/test/test_importlib/test_api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -504,11 +504,6 @@ def test_machinery_deprecated_attributes(self):
with self.assertWarns(DeprecationWarning):
getattr(machinery, attr)

def test_deprecated_windows_registry_finder(self):
from importlib.machinery import WindowsRegistryFinder
with self.assertWarns(DeprecationWarning):
WindowsRegistryFinder()


if __name__ == '__main__':
unittest.main()
6 changes: 6 additions & 0 deletions Lib/test/test_importlib/test_windows.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,12 @@ def test_module_not_found(self):
spec = self.machinery.WindowsRegistryFinder.find_spec(self.test_module)
self.assertIsNone(spec)

def test_raises_deprecation_warning(self):
# WindowsRegistryFinder is not meant to be instantiated, so the
# deprecation warning is raised in the 'find_spec' method instead.
with self.assertWarns(DeprecationWarning):
self.machinery.WindowsRegistryFinder.find_spec('spam')

(Frozen_WindowsRegistryFinderTests,
Source_WindowsRegistryFinderTests
) = test_util.test_both(WindowsRegistryFinderTests, machinery=machinery)
Expand Down
Loading