Skip to content

Commit 26ae05e

Browse files
XuehaiPanXuehaiPan
authored
gh-127405: Add ABIFLAGS to sysconfig variables on Windows (GH-131799)
1 parent 9ded6f0 commit 26ae05e

File tree

7 files changed

+99
-7
lines changed

7 files changed

+99
-7
lines changed

‎Doc/whatsnew/3.14.rst

+9
Original file line numberDiff line numberDiff line change
@@ -1078,13 +1078,22 @@ sys.monitoring
10781078
* Two new events are added: :monitoring-event:`BRANCH_LEFT` and
10791079
:monitoring-event:`BRANCH_RIGHT`. The ``BRANCH`` event is deprecated.
10801080

1081+
1082+
sysconfig
1083+
---------
1084+
1085+
* Add ``ABIFLAGS`` key to :func:`sysconfig.get_config_vars` on Windows.
1086+
(Contributed by Xuehai Pan in :gh:`131799`.)
1087+
1088+
10811089
threading
10821090
---------
10831091

10841092
* :meth:`threading.Thread.start` now sets the operating system thread name
10851093
to :attr:`threading.Thread.name`.
10861094
(Contributed by Victor Stinner in :gh:`59705`.)
10871095

1096+
10881097
tkinter
10891098
-------
10901099

‎Lib/sysconfig/__init__.py

+12-1
Original file line numberDiff line numberDiff line change
@@ -401,9 +401,20 @@ def _init_non_posix(vars):
401401
vars['BINLIBDEST'] = get_path('platstdlib')
402402
vars['INCLUDEPY'] = get_path('include')
403403

404-
# Add EXT_SUFFIX, SOABI, and Py_GIL_DISABLED
404+
# Add EXT_SUFFIX, SOABI, Py_DEBUG, and Py_GIL_DISABLED
405405
vars.update(_sysconfig.config_vars())
406406

407+
# NOTE: ABIFLAGS is only an emulated value. It is not present during build
408+
# on Windows. sys.abiflags is absent on Windows and vars['abiflags']
409+
# is already widely used to calculate paths, so it should remain an
410+
# empty string.
411+
vars['ABIFLAGS'] = ''.join(
412+
(
413+
't' if vars['Py_GIL_DISABLED'] else '',
414+
'_d' if vars['Py_DEBUG'] else '',
415+
),
416+
)
417+
407418
vars['LIBDIR'] = _safe_realpath(os.path.join(get_config_var('installed_base'), 'libs'))
408419
if hasattr(sys, 'dllhandle'):
409420
dllhandle = _winapi.GetModuleFileName(sys.dllhandle)

‎Lib/test/test_sys.py

+2
Original file line numberDiff line numberDiff line change
@@ -724,6 +724,8 @@ def test_attributes(self):
724724
self.assertIn(sys.float_repr_style, ('short', 'legacy'))
725725
if not sys.platform.startswith('win'):
726726
self.assertIsInstance(sys.abiflags, str)
727+
else:
728+
self.assertFalse(hasattr(sys, 'abiflags'))
727729

728730
def test_thread_info(self):
729731
info = sys.thread_info

‎Lib/test/test_sysconfig.py

+64-6
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import textwrap
1010
from copy import copy
1111

12+
from test import support
1213
from test.support import (
1314
captured_stdout,
1415
is_android,
@@ -455,20 +456,20 @@ def test_library(self):
455456
library = sysconfig.get_config_var('LIBRARY')
456457
ldlibrary = sysconfig.get_config_var('LDLIBRARY')
457458
major, minor = sys.version_info[:2]
458-
if sys.platform == 'win32':
459-
self.assertTrue(library.startswith(f'python{major}{minor}'))
460-
self.assertTrue(library.endswith('.dll'))
459+
abiflags = sysconfig.get_config_var('ABIFLAGS')
460+
if sys.platform.startswith('win'):
461+
self.assertEqual(library, f'python{major}{minor}{abiflags}.dll')
461462
self.assertEqual(library, ldlibrary)
462463
elif is_apple_mobile:
463464
framework = sysconfig.get_config_var('PYTHONFRAMEWORK')
464465
self.assertEqual(ldlibrary, f"{framework}.framework/{framework}")
465466
else:
466-
self.assertTrue(library.startswith(f'libpython{major}.{minor}'))
467-
self.assertTrue(library.endswith('.a'))
467+
self.assertStartsWith(library, f'libpython{major}.{minor}')
468+
self.assertEndsWith(library, '.a')
468469
if sys.platform == 'darwin' and sys._framework:
469470
self.skipTest('gh-110824: skip LDLIBRARY test for framework build')
470471
else:
471-
self.assertTrue(ldlibrary.startswith(f'libpython{major}.{minor}'))
472+
self.assertStartsWith(ldlibrary, f'libpython{major}.{minor}')
472473

473474
@unittest.skipUnless(sys.platform == "darwin", "test only relevant on MacOSX")
474475
@requires_subprocess()
@@ -592,6 +593,63 @@ def test_osx_ext_suffix(self):
592593
suffix = sysconfig.get_config_var('EXT_SUFFIX')
593594
self.assertTrue(suffix.endswith('-darwin.so'), suffix)
594595

596+
def test_always_set_py_debug(self):
597+
self.assertIn('Py_DEBUG', sysconfig.get_config_vars())
598+
Py_DEBUG = sysconfig.get_config_var('Py_DEBUG')
599+
self.assertIn(Py_DEBUG, (0, 1))
600+
self.assertEqual(Py_DEBUG, support.Py_DEBUG)
601+
602+
def test_always_set_py_gil_disabled(self):
603+
self.assertIn('Py_GIL_DISABLED', sysconfig.get_config_vars())
604+
Py_GIL_DISABLED = sysconfig.get_config_var('Py_GIL_DISABLED')
605+
self.assertIn(Py_GIL_DISABLED, (0, 1))
606+
self.assertEqual(Py_GIL_DISABLED, support.Py_GIL_DISABLED)
607+
608+
def test_abiflags(self):
609+
# If this test fails on some platforms, maintainers should update the
610+
# test to make it pass, rather than changing the definition of ABIFLAGS.
611+
self.assertIn('abiflags', sysconfig.get_config_vars())
612+
self.assertIn('ABIFLAGS', sysconfig.get_config_vars())
613+
abiflags = sysconfig.get_config_var('abiflags')
614+
ABIFLAGS = sysconfig.get_config_var('ABIFLAGS')
615+
self.assertIsInstance(abiflags, str)
616+
self.assertIsInstance(ABIFLAGS, str)
617+
self.assertIn(abiflags, ABIFLAGS)
618+
if os.name == 'nt':
619+
self.assertEqual(abiflags, '')
620+
621+
if not sys.platform.startswith('win'):
622+
valid_abiflags = ('', 't', 'd', 'td')
623+
else:
624+
# Windows uses '_d' rather than 'd'; see also test_abi_debug below
625+
valid_abiflags = ('', 't', '_d', 't_d')
626+
627+
self.assertIn(ABIFLAGS, valid_abiflags)
628+
629+
def test_abi_debug(self):
630+
ABIFLAGS = sysconfig.get_config_var('ABIFLAGS')
631+
if support.Py_DEBUG:
632+
self.assertIn('d', ABIFLAGS)
633+
else:
634+
self.assertNotIn('d', ABIFLAGS)
635+
636+
# The 'd' flag should always be the last one on Windows.
637+
# On Windows, the debug flag is used differently with a underscore prefix.
638+
# For example, `python{X}.{Y}td` on Unix and `python{X}.{Y}t_d.exe` on Windows.
639+
if support.Py_DEBUG and sys.platform.startswith('win'):
640+
self.assertEndsWith(ABIFLAGS, '_d')
641+
642+
def test_abi_thread(self):
643+
abi_thread = sysconfig.get_config_var('abi_thread')
644+
ABIFLAGS = sysconfig.get_config_var('ABIFLAGS')
645+
self.assertIsInstance(abi_thread, str)
646+
if support.Py_GIL_DISABLED:
647+
self.assertEqual(abi_thread, 't')
648+
self.assertIn('t', ABIFLAGS)
649+
else:
650+
self.assertEqual(abi_thread, '')
651+
self.assertNotIn('t', ABIFLAGS)
652+
595653
@requires_subprocess()
596654
def test_makefile_overwrites_config_vars(self):
597655
script = textwrap.dedent("""

‎Misc/ACKS

+1
Original file line numberDiff line numberDiff line change
@@ -1402,6 +1402,7 @@ Todd R. Palmer
14021402
Juan David Ibáñez Palomar
14031403
Nicola Palumbo
14041404
Jan Palus
1405+
Xuehai Pan
14051406
Yongzhi Pan
14061407
Martin Panter
14071408
Mathias Panzenböck

‎Misc/NEWS.d/next/Windows/2025-03-27-16-22-58.gh-issue-127405.aASs2Z.rst

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Add ``ABIFLAGS`` to :func:`sysconfig.get_config_vars` on Windows. Patch by Xuehai Pan.

‎Modules/_sysconfig.c

+10
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,16 @@ _sysconfig_config_vars_impl(PyObject *module)
6767
return NULL;
6868
}
6969

70+
#ifdef Py_DEBUG
71+
PyObject *py_debug = _PyLong_GetOne();
72+
#else
73+
PyObject *py_debug = _PyLong_GetZero();
74+
#endif
75+
if (PyDict_SetItemString(config, "Py_DEBUG", py_debug) < 0) {
76+
Py_DECREF(config);
77+
return NULL;
78+
}
79+
7080
return config;
7181
}
7282

0 commit comments

Comments
 (0)