Skip to content

gh-146310: Fix ensurepip to treat empty WHEEL_PKG_DIR as unset #146357

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

Open
kimimgo wants to merge 2 commits into
base: main
Choose a base branch
from
+14 −1
Open

gh-146310: Fix ensurepip to treat empty WHEEL_PKG_DIR as unset #146357

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ca5ccee
gh-146310: Fix ensurepip to treat empty WHEEL_PKG_DIR as unset
kimimgo Mar 24, 2026
6ed8ebf
Address review: simplify condition, use import_fresh_module, update NEWS
kimimgo Mar 24, 2026
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
3 changes: 2 additions & 1 deletion Lib/ensurepip/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@
# policies recommend against bundling dependencies. For example, Fedora
# installs wheel packages in the /usr/share/python-wheels/ directory and don't
# install the ensurepip._bundled package.
if (_pkg_dir := sysconfig.get_config_var('WHEEL_PKG_DIR')) is not None:
_pkg_dir = sysconfig.get_config_var('WHEEL_PKG_DIR')
if _pkg_dir:
_WHEEL_PKG_DIR = Path(_pkg_dir).resolve()
else:
_WHEEL_PKG_DIR = None
Expand Down
10 changes: 10 additions & 0 deletions Lib/test/test_ensurepip.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import unittest
import unittest.mock
from pathlib import Path
from test.support import import_helper

import ensurepip
import ensurepip._uninstall
Expand Down Expand Up @@ -36,6 +37,15 @@ def test_version_no_dir(self):
# when the bundled pip wheel is used, we get _PIP_VERSION
self.assertEqual(ensurepip._PIP_VERSION, ensurepip.version())

def test_wheel_pkg_dir_none(self):
# GH#146310: empty or None WHEEL_PKG_DIR should not search CWD
for value in ('', None):
with unittest.mock.patch('sysconfig.get_config_var',
return_value=value) as get_config_var:
module = import_helper.import_fresh_module('ensurepip')
self.assertIsNone(module._WHEEL_PKG_DIR)
get_config_var.assert_called_once_with('WHEEL_PKG_DIR')

def test_selected_wheel_path_no_dir(self):
pip_filename = f'pip-{ensurepip._PIP_VERSION}-py3-none-any.whl'
with unittest.mock.patch.object(ensurepip, '_WHEEL_PKG_DIR', None):
Expand Down
2 changes: 2 additions & 0 deletions Misc/NEWS.d/next/Library/2026-03-24-03-49-50.gh-issue-146310.WhlDir.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
The :mod:`ensurepip` module no longer looks for ``pip-*.whl`` wheel packages
in the current directory.
Loading