Skip to content
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

bpo-38662: Invoke pip via runpy, in ensurepip #17029

Closed
wants to merge 1 commit into from
Closed

bpo-38662: Invoke pip via runpy, in ensurepip #17029

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 12 additions & 3 deletions Lib/ensurepip/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import os
import os.path
import sys
import runpy
import tempfile
from importlib import resources

Expand All @@ -26,9 +27,17 @@ def _run_pip(args, additional_paths=None):
if additional_paths is not None:
sys.path = additional_paths + sys.path

# Install the bundled software
import pip._internal
return pip._internal.main(args)
# Invoke pip as if it's the main module, and catch the exit.
backup_argv = sys.argv[:]
sys.argv[1:] = args
try:
runpy.run_module("pip", run_name="__main__", alter_sys=True)
except SystemExit as e:
return e.code
finally:
sys.argv[:] = backup_argv

assert 0, "should never reach here"
Copy link
Contributor

Choose a reason for hiding this comment

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

Why don't just write a return o raise an exception instead of the message "Should never reach here"?

Copy link
Member Author

Choose a reason for hiding this comment

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

Well, they'd be functionally the same as far as I'm concerned. This is just a sanity-check, so I'm using an assert.

Anyway, if this is the problem with this PR, I'll be happy to change it.

Copy link
Contributor

Choose a reason for hiding this comment

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

"raise SystemError" complaining that pip didn't exit as expected would be the way to go here.



def version():
Expand Down