From 0eefa8265beb85b6c849c70fa71cce0bd151948b Mon Sep 17 00:00:00 2001 From: Avasam Date: Mon, 19 Feb 2024 17:51:21 -0500 Subject: [PATCH 1/2] Avoid private _config_vars --- setuptools/_distutils/tests/test_util.py | 2 +- setuptools/command/build_ext.py | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/setuptools/_distutils/tests/test_util.py b/setuptools/_distutils/tests/test_util.py index 070a277069..74fb083a87 100644 --- a/setuptools/_distutils/tests/test_util.py +++ b/setuptools/_distutils/tests/test_util.py @@ -33,7 +33,7 @@ def environment(monkeypatch): monkeypatch.setattr(os.path, 'join', os.path.join) monkeypatch.setattr(os.path, 'isabs', os.path.isabs) monkeypatch.setattr(os.path, 'splitdrive', os.path.splitdrive) - monkeypatch.setattr(sysconfig, '_config_vars', copy(sysconfig._config_vars)) + monkeypatch.setattr(sysconfig, 'get_config_vars', sysconfig.get_config_vars) @pytest.mark.usefixtures('save_env') diff --git a/setuptools/command/build_ext.py b/setuptools/command/build_ext.py index 780afe3aec..4b6f5ad0d7 100644 --- a/setuptools/command/build_ext.py +++ b/setuptools/command/build_ext.py @@ -8,7 +8,7 @@ from distutils.command.build_ext import build_ext as _du_build_ext from distutils.ccompiler import new_compiler -from distutils.sysconfig import customize_compiler, get_config_var +from distutils.sysconfig import customize_compiler, get_config_var, get_config_vars from distutils import log from setuptools.errors import BaseError @@ -26,7 +26,8 @@ # make sure _config_vars is initialized get_config_var("LDSHARED") -from distutils.sysconfig import _config_vars as _CONFIG_VARS # noqa + +_CONFIG_VARS = get_config_vars() def _customize_compiler_for_shlib(compiler): From b67e2c16b17c1d97b777cf3fc9ce0687ee85d19b Mon Sep 17 00:00:00 2001 From: Avasam Date: Mon, 19 Feb 2024 18:03:29 -0500 Subject: [PATCH 2/2] get_config_vars already ensures _config_vars is initialized --- setuptools/command/build_ext.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/setuptools/command/build_ext.py b/setuptools/command/build_ext.py index 4b6f5ad0d7..6a782772a4 100644 --- a/setuptools/command/build_ext.py +++ b/setuptools/command/build_ext.py @@ -24,9 +24,6 @@ except ImportError: _build_ext = _du_build_ext -# make sure _config_vars is initialized -get_config_var("LDSHARED") - _CONFIG_VARS = get_config_vars()