2024-12-05 21:49:05 +00:00
committed by Git OBS Bridge
parent 9096e514fd
commit 2a69083063
3 changed files with 23 additions and 19 deletions

View File

@@ -24,15 +24,12 @@ Co-authored-by: Miro Hrončok <miro@hroncok.cz>
Co-authored-by: Michal Cyprian <m.cyprian@gmail.com> Co-authored-by: Michal Cyprian <m.cyprian@gmail.com>
Co-authored-by: Lumír Balhar <frenzy.madness@gmail.com> Co-authored-by: Lumír Balhar <frenzy.madness@gmail.com>
--- ---
Lib/site.py | 9 ++++++- Lib/sysconfig.py | 51 ++++++++++++++++++++++++++++++++++++++++++++-
Lib/sysconfig.py | 49 +++++++++++++++++++++++++++++++++++++- Lib/test/test_sysconfig.py | 17 +++++++++++++--
Lib/test/test_sysconfig.py | 17 +++++++++++-- 2 files changed, 65 insertions(+), 3 deletions(-)
3 files changed, 71 insertions(+), 4 deletions(-)
Index: Python-3.12.4/Lib/sysconfig.py --- a/Lib/sysconfig.py
=================================================================== +++ b/Lib/sysconfig.py
--- Python-3.12.4.orig/Lib/sysconfig.py
+++ Python-3.12.4/Lib/sysconfig.py
@@ -104,6 +104,11 @@ if os.name == 'nt': @@ -104,6 +104,11 @@ if os.name == 'nt':
else: else:
_INSTALL_SCHEMES['venv'] = _INSTALL_SCHEMES['posix_venv'] _INSTALL_SCHEMES['venv'] = _INSTALL_SCHEMES['posix_venv']
@@ -45,7 +42,7 @@ Index: Python-3.12.4/Lib/sysconfig.py
# NOTE: site.py has copy of this function. # NOTE: site.py has copy of this function.
# Sync it when modify this function. # Sync it when modify this function.
@@ -163,6 +168,19 @@ if _HAS_USER_BASE: @@ -163,13 +168,28 @@ if _HAS_USER_BASE:
}, },
} }
@@ -65,7 +62,16 @@ Index: Python-3.12.4/Lib/sysconfig.py
_SCHEME_KEYS = ('stdlib', 'platstdlib', 'purelib', 'platlib', 'include', _SCHEME_KEYS = ('stdlib', 'platstdlib', 'purelib', 'platlib', 'include',
'scripts', 'data') 'scripts', 'data')
@@ -263,11 +281,40 @@ def _extend_dict(target_dict, other_dict _PY_VERSION = sys.version.split()[0]
_PY_VERSION_SHORT = f'{sys.version_info[0]}.{sys.version_info[1]}'
_PY_VERSION_SHORT_NO_DOT = f'{sys.version_info[0]}{sys.version_info[1]}'
+_PREFIX = os.path.normpath(sys.prefix)
_BASE_PREFIX = os.path.normpath(sys.base_prefix)
+_EXEC_PREFIX = os.path.normpath(sys.exec_prefix)
_BASE_EXEC_PREFIX = os.path.normpath(sys.base_exec_prefix)
# Mutex guarding initialization of _CONFIG_VARS.
_CONFIG_VARS_LOCK = threading.RLock()
@@ -261,11 +281,40 @@ def _extend_dict(target_dict, other_dict
target_dict[key] = value target_dict[key] = value
@@ -107,11 +113,9 @@ Index: Python-3.12.4/Lib/sysconfig.py
if os.name == 'nt': if os.name == 'nt':
# On Windows we want to substitute 'lib' for schemes rather # On Windows we want to substitute 'lib' for schemes rather
# than the native value (without modifying vars, in case it # than the native value (without modifying vars, in case it
Index: Python-3.12.4/Lib/test/test_sysconfig.py --- a/Lib/test/test_sysconfig.py
=================================================================== +++ b/Lib/test/test_sysconfig.py
--- Python-3.12.4.orig/Lib/test/test_sysconfig.py @@ -119,8 +119,19 @@ class TestSysConfig(unittest.TestCase):
+++ Python-3.12.4/Lib/test/test_sysconfig.py
@@ -110,8 +110,19 @@ class TestSysConfig(unittest.TestCase):
for scheme in _INSTALL_SCHEMES: for scheme in _INSTALL_SCHEMES:
for name in _INSTALL_SCHEMES[scheme]: for name in _INSTALL_SCHEMES[scheme]:
expected = _INSTALL_SCHEMES[scheme][name].format(**config_vars) expected = _INSTALL_SCHEMES[scheme][name].format(**config_vars)
@@ -132,7 +136,7 @@ Index: Python-3.12.4/Lib/test/test_sysconfig.py
os.path.normpath(expected), os.path.normpath(expected),
) )
@@ -344,7 +355,7 @@ class TestSysConfig(unittest.TestCase): @@ -353,7 +364,7 @@ class TestSysConfig(unittest.TestCase):
self.assertTrue(os.path.isfile(config_h), config_h) self.assertTrue(os.path.isfile(config_h), config_h)
def test_get_scheme_names(self): def test_get_scheme_names(self):
@@ -141,7 +145,7 @@ Index: Python-3.12.4/Lib/test/test_sysconfig.py
if HAS_USER_BASE: if HAS_USER_BASE:
wanted.extend(['nt_user', 'osx_framework_user', 'posix_user']) wanted.extend(['nt_user', 'osx_framework_user', 'posix_user'])
self.assertEqual(get_scheme_names(), tuple(sorted(wanted))) self.assertEqual(get_scheme_names(), tuple(sorted(wanted)))
@@ -356,6 +367,8 @@ class TestSysConfig(unittest.TestCase): @@ -365,6 +376,8 @@ class TestSysConfig(unittest.TestCase):
cmd = "-c", "import sysconfig; print(sysconfig.get_platform())" cmd = "-c", "import sysconfig; print(sysconfig.get_platform())"
self.assertEqual(py.call_real(*cmd), py.call_link(*cmd)) self.assertEqual(py.call_real(*cmd), py.call_link(*cmd))

View File

@@ -21,7 +21,7 @@
Create a Python.framework rather than a traditional Unix install. Optional Create a Python.framework rather than a traditional Unix install. Optional
--- a/Misc/NEWS --- a/Misc/NEWS
+++ b/Misc/NEWS +++ b/Misc/NEWS
@@ -14138,7 +14138,7 @@ C API @@ -14575,7 +14575,7 @@ C API
- bpo-40939: Removed documentation for the removed ``PyParser_*`` C API. - bpo-40939: Removed documentation for the removed ``PyParser_*`` C API.
- bpo-43795: The list in :ref:`limited-api-list` now shows the public name - bpo-43795: The list in :ref:`limited-api-list` now shows the public name

View File

@@ -4,7 +4,7 @@
--- a/Lib/test/test_posix.py --- a/Lib/test/test_posix.py
+++ b/Lib/test/test_posix.py +++ b/Lib/test/test_posix.py
@@ -435,7 +435,7 @@ class PosixTester(unittest.TestCase): @@ -437,7 +437,7 @@ class PosixTester(unittest.TestCase):
def test_posix_fadvise(self): def test_posix_fadvise(self):
fd = os.open(os_helper.TESTFN, os.O_RDONLY) fd = os.open(os_helper.TESTFN, os.O_RDONLY)
try: try: