Repository navigation
gh-75221: Search __main__ only in the executed directory or zipfile - #155256
Open
serhiy-storchaka wants to merge 2 commits into
Open
serhiy-storchaka wants to merge 2 commits into
serhiy-storchaka wants to merge 2 commits into
Conversation
…file runpy.run_path() and the execution of a directory or a zipfile searched the __main__ module in the whole sys.path, so an existing __main__ module located elsewhere could be executed instead of failing. As a result, running Lib/test/test_runpy.py directly ran the whole test suite. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
serhiy-storchaka
requested review from
FFY00 and
ericsnowcurrently
as code owners
August 5, 2026 19:29
Documentation build overview
453 files changed ·
|
|
This PR is stale because it has been open for 90 days with no activity. |
ncoghlan
approved these changes
Nov 16, 2026
ncoghlan
left a comment
Contributor
There was a problem hiding this comment.
LGTM (my only concern was the new pkgutil dependency, and I convinced myself that the reduction in potentially confusing behaviour is worth the implicit imports of additional modules that are frequently going to be imported by the code being executed anyway)
| kwargs = {"name": main_name} if issubclass(error, ImportError) else {} | ||
| saved_main = sys.modules[main_name] | ||
| del sys.modules[main_name] | ||
| from pkgutil import get_importer |
Contributor
There was a problem hiding this comment.
The pkgutil dependency gave me a momentary pause for concern, but that's still a fairly low level module. Compared to importing runpy itself, 3.15 shows me the following extra imports:
import time: 61 | 61 | itertools
import time: 82 | 82 | keyword
import time: 40 | 40 | _operator
import time: 194 | 233 | operator
import time: 119 | 119 | reprlib
import time: 47 | 47 | _collections
import time: 658 | 1198 | collections
import time: 32 | 32 | _functools
import time: 363 | 394 | functools
import time: 128 | 128 | _weakrefset
import time: 234 | 361 | weakref
import time: 269 | 2221 | pkgutil
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
runpy.run_path()and the execution of a directory or a zipfile searched the__main__module in the wholesys.path, so an existing__main__module located elsewhere could be executed instead of failing.As a result, running
Lib/test/test_runpy.pydirectly ran the whole test suite.The
__main__module is now searched only insys.path[0]-- the executed directory or zipfile.