Skip to content

Commit

Permalink
Merge pull request #11248 from pfmoore/debug_resources
Browse files Browse the repository at this point in the history
Make the debug command safe for use in a zipapp
  • Loading branch information
pfmoore authored Jul 11, 2022
2 parents f66b3e8 + 080cd2f commit c0fb4bf
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 6 deletions.
2 changes: 2 additions & 0 deletions news/11248.bugfix.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Use ``importlib.resources`` to read the ``vendor.txt`` file in ``pip debug``.
This makes the command safe for use from a zipapp.
8 changes: 2 additions & 6 deletions src/pip/_internal/commands/debug.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import importlib.resources
import locale
import logging
import os
Expand All @@ -10,7 +11,6 @@
from pip._vendor.certifi import where
from pip._vendor.packaging.version import parse as parse_version

from pip import __file__ as pip_location
from pip._internal.cli import cmdoptions
from pip._internal.cli.base_command import Command
from pip._internal.cli.cmdoptions import make_target_python
Expand All @@ -35,11 +35,7 @@ def show_sys_implementation() -> None:


def create_vendor_txt_map() -> Dict[str, str]:
vendor_txt_path = os.path.join(
os.path.dirname(pip_location), "_vendor", "vendor.txt"
)

with open(vendor_txt_path) as f:
with importlib.resources.open_text("pip._vendor", "vendor.txt") as f:
# Purge non version specifying lines.
# Also, remove any space prefix or suffixes (including comments).
lines = [
Expand Down

0 comments on commit c0fb4bf

Please sign in to comment.