Skip to content

gh-94379: Remove zipimport find_loader() and find_module() methods #94380

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

Jump to bottom
Merged
merged 1 commit into from
Jul 5, 2022
Merged

gh-94379: Remove zipimport find_loader() and find_module() methods #94380

merged 1 commit into from
Jul 5, 2022

Conversation

vstinner
Copy link
Member

@vstinner vstinner commented Jun 28, 2022 •
edited by bedevere-bot
Loading

zipimport: Remove find_loader() and find_module() methods, deprecated
in Python 3.10. Use the find_spec()` method instead. See PEP 451 for
the rationale.

@vstinner vstinner mentioned this pull request Jun 28, 2022
Closed
@vstinner
Copy link
Member Author

cc @brettcannon

@vstinner vstinner marked this pull request as ready for review June 28, 2022 14:08
brettcannon
brettcannon requested changes Jun 28, 2022
View reviewed changes
Copy link
Member

@brettcannon brettcannon left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The code removal looks fine, but the doc changes left out the removal of load_module() as well.

@bedevere-bot
Copy link

When you're done making the requested changes, leave the comment: I have made the requested changes; please review again.

@vstinner
Copy link
Member Author

@brettcannon: I updated the PR to mention also load_module() removal, and fix test_zipimport... But now, I feel that I removed too many lines in the tests! Maybe the tests should be fixed instead?

Problem: I don't know how to fix the packdir2 tests:

         mod_path = packdir2 + TESTMOD
         mod_name = module_path_to_dotted_name(mod_path)
-        mod = importlib.import_module(mod_name)
-        self.assertTrue(mod_name in sys.modules)
-        self.assertIsNone(zi.get_source(TESTPACK))
-        self.assertIsNone(zi.get_source(mod_path))
-        self.assertEqual(zi.get_filename(mod_path), mod.__file__)
-        # To pass in the module name instead of the path, we must use the
-        # right importer
-        loader = mod.__spec__.loader
-        self.assertIsNone(loader.get_source(mod_name))
-        self.assertEqual(loader.get_filename(mod_name), mod.__file__)

brettcannon
brettcannon requested changes Jun 29, 2022
View reviewed changes
Doc/whatsnew/3.12.rst Outdated
@@ -282,6 +282,10 @@ Removed
a C implementation of :func:`~hashlib.pbkdf2_hmac()` which is faster.
(Contributed by Victor Stinner in :gh:`94199`.)

* :mod:`zipimport`: Remove ``find_loader()``, ``find_module()`` and
``load_module()`` methods, deprecated in Python 3.10. Use the ``find_spec()``
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

find_spec() only replaces find_loader() and find_module(), so this sentence is a bit misleading. Same is true for the news entry.

Lib/test/test_zipimport.py Outdated
@@ -484,26 +470,12 @@ def testZipImporterMethods(self):
spec.loader.exec_module(mod)
self.assertEqual(zi.get_filename(TESTPACK), mod.__file__)

existing_pack_path = importlib.import_module(TESTPACK).__path__[0]
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why the test removals for lines that don't directly use the associated methods?

@brettcannon
Copy link
Member

I don't know how to fix the packdir2 test

How is it failing?

Maybe only do the find_*() methods in this PR and worry about load_module() in another one?

@vstinner
Copy link
Member Author

vstinner commented Jul 4, 2022

Maybe only do the find_*() methods in this PR and worry about load_module() in another one?

Good idea! I modified this PR to only remove find_loader() and find_module() methods: keep load_module() for now (it can be removed in a separated PR).

@vstinner
Copy link
Member Author

vstinner commented Jul 4, 2022

@brettcannon: Would you mind to review the updated PR? Now it only removes find_loader() and find_module() methods, and it only removes the bare minimum lines in test_zipimport.py.

Once the PR gets approved, I will solve the Doc/whatsnew/3.12.rst conflict.

@brettcannon
Copy link
Member

@vstinner LGTM! And an FYI for anyone else who reviews, the get_filename() function gets used in other places, so it still gets tested.

@vstinner
gh-94379: Remove zipimport find_loader() and find_module() methods
9328dfe 
zipimport: Remove find_loader() and find_module() methods, deprecated
in Python 3.10: use the find_spec() method instead. See PEP 451 for
the rationale.
@vstinner vstinner merged commit 92bcb26 into python:main Jul 5, 2022
@vstinner vstinner deleted the zipimport branch July 5, 2022 10:11
@vstinner
Copy link
Member Author

vstinner commented Jul 5, 2022

Thanks for the reviews @warsaw and @brettcannon! It's easier to modify zipimport since @serhiy-storchaka rewrote it in pure Python :-)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@brettcannon brettcannon brettcannon approved these changes

@warsaw warsaw warsaw approved these changes

@encukou encukou Awaiting requested review from encukou

@ericsnowcurrently ericsnowcurrently Awaiting requested review from ericsnowcurrently ericsnowcurrently is a code owner

@ncoghlan ncoghlan Awaiting requested review from ncoghlan ncoghlan is a code owner

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@vstinner @bedevere-bot @brettcannon @warsaw