From 794075fd01f1a0a90675beba42db3390f1f7cf1e Mon Sep 17 00:00:00 2001 From: Adam Turner <9087854+aa-turner@users.noreply.github.com> Date: Sun, 4 May 2025 20:42:57 +0100 Subject: [PATCH 1/4] Minor fixes after renaming to _remotedebugging --- Lib/test/test_external_inspection.py | 2 +- Lib/test/test_sys.py | 2 +- Tools/build/generate_stdlib_module_names.py | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Lib/test/test_external_inspection.py b/Lib/test/test_external_inspection.py index 0fd704e698b90e..e6bd79e24e98c1 100644 --- a/Lib/test/test_external_inspection.py +++ b/Lib/test/test_external_inspection.py @@ -20,7 +20,7 @@ from _remotedebugging import get_all_awaited_by except ImportError: raise unittest.SkipTest( - "Test only runs when _remotedebuggingmodule is available") + "Test only runs when _remotedebugging is available") def _make_test_script(script_dir, script_basename, source): to_return = make_script(script_dir, script_basename, source) diff --git a/Lib/test/test_sys.py b/Lib/test/test_sys.py index 10c3e0e9a1d2bb..62e0996e3fa525 100644 --- a/Lib/test/test_sys.py +++ b/Lib/test/test_sys.py @@ -1960,7 +1960,7 @@ def _supports_remote_attaching(): PROCESS_VM_READV_SUPPORTED = False try: - from _remotedebuggingmodule import PROCESS_VM_READV_SUPPORTED + from _remotedebugging import PROCESS_VM_READV_SUPPORTED except ImportError: pass diff --git a/Tools/build/generate_stdlib_module_names.py b/Tools/build/generate_stdlib_module_names.py index 761eecba96f291..88414cdbb37a8d 100644 --- a/Tools/build/generate_stdlib_module_names.py +++ b/Tools/build/generate_stdlib_module_names.py @@ -34,7 +34,6 @@ '_testlimitedcapi', '_testmultiphase', '_testsinglephase', - '_remotedebugging', '_xxtestfuzz', 'idlelib.idle_test', 'test', From 90b4d186ff96c1f3b1b1e1df1049bc72a944ffe8 Mon Sep 17 00:00:00 2001 From: Adam Turner <9087854+aa-turner@users.noreply.github.com> Date: Sun, 4 May 2025 20:47:55 +0100 Subject: [PATCH 2/4] Sorting --- Modules/Setup | 2 +- Modules/Setup.stdlib.in | 2 +- PCbuild/pcbuild.proj | 2 +- configure | 92 ++++++++++++++++++++--------------------- configure.ac | 2 +- 5 files changed, 50 insertions(+), 50 deletions(-) diff --git a/Modules/Setup b/Modules/Setup index f23f082d9eff5f..b9d01d5cbc6ace 100644 --- a/Modules/Setup +++ b/Modules/Setup @@ -284,10 +284,10 @@ PYTHONPATH=$(COREPYTHONPATH) #*shared* #_ctypes_test _ctypes/_ctypes_test.c +#_remotedebugging _remotedebuggingmodule.c #_testcapi _testcapimodule.c #_testimportmultiple _testimportmultiple.c #_testmultiphase _testmultiphase.c -#_remotedebugging _remotedebuggingmodule.c #_testsinglephase _testsinglephase.c # --- diff --git a/Modules/Setup.stdlib.in b/Modules/Setup.stdlib.in index 1512187bb097bd..be571a367855c1 100644 --- a/Modules/Setup.stdlib.in +++ b/Modules/Setup.stdlib.in @@ -33,7 +33,6 @@ # Modules that should always be present (POSIX and Windows): @MODULE_ARRAY_TRUE@array arraymodule.c @MODULE__ASYNCIO_TRUE@_asyncio _asynciomodule.c -@MODULE__REMOTEDEBUGGING_TRUE@_remotedebugging _remotedebuggingmodule.c @MODULE__BISECT_TRUE@_bisect _bisectmodule.c @MODULE__CSV_TRUE@_csv _csv.c @MODULE__HEAPQ_TRUE@_heapq _heapqmodule.c @@ -42,6 +41,7 @@ @MODULE__PICKLE_TRUE@_pickle _pickle.c @MODULE__QUEUE_TRUE@_queue _queuemodule.c @MODULE__RANDOM_TRUE@_random _randommodule.c +@MODULE__REMOTEDEBUGGING_TRUE@_remotedebugging _remotedebuggingmodule.c @MODULE__STRUCT_TRUE@_struct _struct.c # build supports subinterpreters diff --git a/PCbuild/pcbuild.proj b/PCbuild/pcbuild.proj index eec213d7bac612..c2c8b6f4a9e98a 100644 --- a/PCbuild/pcbuild.proj +++ b/PCbuild/pcbuild.proj @@ -66,7 +66,7 @@ - + diff --git a/configure b/configure index 397f867df34dc2..0dcfa345d267c1 100755 --- a/configure +++ b/configure @@ -654,8 +654,6 @@ MODULE__XXTESTFUZZ_FALSE MODULE__XXTESTFUZZ_TRUE MODULE_XXSUBTYPE_FALSE MODULE_XXSUBTYPE_TRUE -MODULE__REMOTEDEBUGGING_FALSE -MODULE__REMOTEDEBUGGING_TRUE MODULE__TESTSINGLEPHASE_FALSE MODULE__TESTSINGLEPHASE_TRUE MODULE__TESTMULTIPHASE_FALSE @@ -694,6 +692,8 @@ MODULE__TKINTER_FALSE MODULE__TKINTER_TRUE MODULE__SQLITE3_FALSE MODULE__SQLITE3_TRUE +MODULE__REMOTEDEBUGGING_FALSE +MODULE__REMOTEDEBUGGING_TRUE MODULE_READLINE_FALSE MODULE_READLINE_TRUE MODULE__GDBM_FALSE @@ -33132,6 +33132,46 @@ fi printf "%s\n" "$py_cv_module_readline" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for stdlib extension module _remotedebugging" >&5 +printf %s "checking for stdlib extension module _remotedebugging... " >&6; } + if test "$py_cv_module__remotedebugging" != "n/a" +then : + + if test "$TEST_MODULES" = yes +then : + if true +then : + py_cv_module__remotedebugging=yes +else case e in #( + e) py_cv_module__remotedebugging=missing ;; +esac +fi +else case e in #( + e) py_cv_module__remotedebugging=disabled ;; +esac +fi + +fi + as_fn_append MODULE_BLOCK "MODULE__REMOTEDEBUGGING_STATE=$py_cv_module__remotedebugging$as_nl" + if test "x$py_cv_module__remotedebugging" = xyes +then : + + + + +fi + if test "$py_cv_module__remotedebugging" = yes; then + MODULE__REMOTEDEBUGGING_TRUE= + MODULE__REMOTEDEBUGGING_FALSE='#' +else + MODULE__REMOTEDEBUGGING_TRUE='#' + MODULE__REMOTEDEBUGGING_FALSE= +fi + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $py_cv_module__remotedebugging" >&5 +printf "%s\n" "$py_cv_module__remotedebugging" >&6; } + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for stdlib extension module _sqlite3" >&5 printf %s "checking for stdlib extension module _sqlite3... " >&6; } if test "$py_cv_module__sqlite3" != "n/a" @@ -33877,46 +33917,6 @@ fi printf "%s\n" "$py_cv_module__testsinglephase" >&6; } - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for stdlib extension module _remotedebugging" >&5 -printf %s "checking for stdlib extension module _remotedebugging... " >&6; } - if test "$py_cv_module__remotedebugging" != "n/a" -then : - - if test "$TEST_MODULES" = yes -then : - if true -then : - py_cv_module__remotedebugging=yes -else case e in #( - e) py_cv_module__remotedebugging=missing ;; -esac -fi -else case e in #( - e) py_cv_module__remotedebugging=disabled ;; -esac -fi - -fi - as_fn_append MODULE_BLOCK "MODULE__REMOTEDEBUGGING_STATE=$py_cv_module__remotedebugging$as_nl" - if test "x$py_cv_module__remotedebugging" = xyes -then : - - - - -fi - if test "$py_cv_module__remotedebugging" = yes; then - MODULE__REMOTEDEBUGGING_TRUE= - MODULE__REMOTEDEBUGGING_FALSE='#' -else - MODULE__REMOTEDEBUGGING_TRUE='#' - MODULE__REMOTEDEBUGGING_FALSE= -fi - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $py_cv_module__remotedebugging" >&5 -printf "%s\n" "$py_cv_module__remotedebugging" >&6; } - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for stdlib extension module xxsubtype" >&5 printf %s "checking for stdlib extension module xxsubtype... " >&6; } if test "$py_cv_module_xxsubtype" != "n/a" @@ -34475,6 +34475,10 @@ if test -z "${MODULE_READLINE_TRUE}" && test -z "${MODULE_READLINE_FALSE}"; then as_fn_error $? "conditional \"MODULE_READLINE\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${MODULE__REMOTEDEBUGGING_TRUE}" && test -z "${MODULE__REMOTEDEBUGGING_FALSE}"; then + as_fn_error $? "conditional \"MODULE__REMOTEDEBUGGING\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${MODULE__SQLITE3_TRUE}" && test -z "${MODULE__SQLITE3_FALSE}"; then as_fn_error $? "conditional \"MODULE__SQLITE3\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -34551,10 +34555,6 @@ if test -z "${MODULE__TESTSINGLEPHASE_TRUE}" && test -z "${MODULE__TESTSINGLEPHA as_fn_error $? "conditional \"MODULE__TESTSINGLEPHASE\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -if test -z "${MODULE__REMOTEDEBUGGING_TRUE}" && test -z "${MODULE__REMOTEDEBUGGING_FALSE}"; then - as_fn_error $? "conditional \"MODULE__REMOTEDEBUGGING\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi if test -z "${MODULE_XXSUBTYPE_TRUE}" && test -z "${MODULE_XXSUBTYPE_FALSE}"; then as_fn_error $? "conditional \"MODULE_XXSUBTYPE\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 diff --git a/configure.ac b/configure.ac index 76042522ae1e54..1f59261b615df6 100644 --- a/configure.ac +++ b/configure.ac @@ -8077,6 +8077,7 @@ PY_STDLIB_MOD([_gdbm], PY_STDLIB_MOD([readline], [], [test "$with_readline" != "no"], [$READLINE_CFLAGS], [$READLINE_LIBS]) +PY_STDLIB_MOD([_remotedebugging], [test "$TEST_MODULES" = yes]) PY_STDLIB_MOD([_sqlite3], [test "$have_sqlite3" = "yes"], [test "$have_supported_sqlite3" = "yes"], @@ -8119,7 +8120,6 @@ PY_STDLIB_MOD([_testbuffer], [test "$TEST_MODULES" = yes]) PY_STDLIB_MOD([_testimportmultiple], [test "$TEST_MODULES" = yes], [test "$ac_cv_func_dlopen" = yes]) PY_STDLIB_MOD([_testmultiphase], [test "$TEST_MODULES" = yes], [test "$ac_cv_func_dlopen" = yes]) PY_STDLIB_MOD([_testsinglephase], [test "$TEST_MODULES" = yes], [test "$ac_cv_func_dlopen" = yes]) -PY_STDLIB_MOD([_remotedebugging], [test "$TEST_MODULES" = yes]) PY_STDLIB_MOD([xxsubtype], [test "$TEST_MODULES" = yes]) PY_STDLIB_MOD([_xxtestfuzz], [test "$TEST_MODULES" = yes]) PY_STDLIB_MOD([_ctypes_test], From 2e6b80e734c2a32d248c6480dc69eab17abc5a9e Mon Sep 17 00:00:00 2001 From: Adam Turner <9087854+aa-turner@users.noreply.github.com> Date: Sun, 4 May 2025 20:59:36 +0100 Subject: [PATCH 3/4] Rename to _remote_debugging --- Lib/asyncio/tools.py | 2 +- Lib/test/test_external_inspection.py | 10 +-- Lib/test/test_sys.py | 2 +- Modules/Setup | 2 +- Modules/Setup.stdlib.in | 2 +- ...ingmodule.c => _remote_debugging_module.c} | 4 +- ...ging.vcxproj => _remote_debugging.vcxproj} | 4 +- ...ters => _remote_debugging.vcxproj.filters} | 2 +- PCbuild/pcbuild.proj | 2 +- PCbuild/pcbuild.sln | 2 +- configure | 76 +++++++------------ configure.ac | 4 +- 12 files changed, 47 insertions(+), 65 deletions(-) rename Modules/{_remotedebuggingmodule.c => _remote_debugging_module.c} (99%) rename PCbuild/{_remotedebugging.vcxproj => _remote_debugging.vcxproj} (97%) rename PCbuild/{_remotedebugging.vcxproj.filters => _remote_debugging.vcxproj.filters} (90%) diff --git a/Lib/asyncio/tools.py b/Lib/asyncio/tools.py index 16440b594ad993..491125e265fdbe 100644 --- a/Lib/asyncio/tools.py +++ b/Lib/asyncio/tools.py @@ -5,7 +5,7 @@ from itertools import count from enum import Enum import sys -from _remotedebugging import get_all_awaited_by +from _remote_debugging import get_all_awaited_by class NodeType(Enum): diff --git a/Lib/test/test_external_inspection.py b/Lib/test/test_external_inspection.py index e6bd79e24e98c1..7f3a21d7e614ea 100644 --- a/Lib/test/test_external_inspection.py +++ b/Lib/test/test_external_inspection.py @@ -14,13 +14,13 @@ PROCESS_VM_READV_SUPPORTED = False try: - from _remotedebugging import PROCESS_VM_READV_SUPPORTED - from _remotedebugging import get_stack_trace - from _remotedebugging import get_async_stack_trace - from _remotedebugging import get_all_awaited_by + from _remote_debugging import PROCESS_VM_READV_SUPPORTED + from _remote_debugging import get_stack_trace + from _remote_debugging import get_async_stack_trace + from _remote_debugging import get_all_awaited_by except ImportError: raise unittest.SkipTest( - "Test only runs when _remotedebugging is available") + "Test only runs when _remote_debugging is available") def _make_test_script(script_dir, script_basename, source): to_return = make_script(script_dir, script_basename, source) diff --git a/Lib/test/test_sys.py b/Lib/test/test_sys.py index 62e0996e3fa525..b3dba9dad006ab 100644 --- a/Lib/test/test_sys.py +++ b/Lib/test/test_sys.py @@ -1960,7 +1960,7 @@ def _supports_remote_attaching(): PROCESS_VM_READV_SUPPORTED = False try: - from _remotedebugging import PROCESS_VM_READV_SUPPORTED + from _remote_debugging import PROCESS_VM_READV_SUPPORTED except ImportError: pass diff --git a/Modules/Setup b/Modules/Setup index b9d01d5cbc6ace..81f364abd479cb 100644 --- a/Modules/Setup +++ b/Modules/Setup @@ -284,7 +284,7 @@ PYTHONPATH=$(COREPYTHONPATH) #*shared* #_ctypes_test _ctypes/_ctypes_test.c -#_remotedebugging _remotedebuggingmodule.c +#_remote_debugging _remote_debugging_module.c #_testcapi _testcapimodule.c #_testimportmultiple _testimportmultiple.c #_testmultiphase _testmultiphase.c diff --git a/Modules/Setup.stdlib.in b/Modules/Setup.stdlib.in index be571a367855c1..8b676ca69b081b 100644 --- a/Modules/Setup.stdlib.in +++ b/Modules/Setup.stdlib.in @@ -41,7 +41,7 @@ @MODULE__PICKLE_TRUE@_pickle _pickle.c @MODULE__QUEUE_TRUE@_queue _queuemodule.c @MODULE__RANDOM_TRUE@_random _randommodule.c -@MODULE__REMOTEDEBUGGING_TRUE@_remotedebugging _remotedebuggingmodule.c +@MODULE__REMOTE_DEBUGGING_TRUE@_remote_debugging _remote_debugging_module.c @MODULE__STRUCT_TRUE@_struct _struct.c # build supports subinterpreters diff --git a/Modules/_remotedebuggingmodule.c b/Modules/_remote_debugging_module.c similarity index 99% rename from Modules/_remotedebuggingmodule.c rename to Modules/_remote_debugging_module.c index 0e055ae1604d5f..ee2c1616315ef9 100644 --- a/Modules/_remotedebuggingmodule.c +++ b/Modules/_remote_debugging_module.c @@ -1554,13 +1554,13 @@ static PyMethodDef methods[] = { static struct PyModuleDef module = { .m_base = PyModuleDef_HEAD_INIT, - .m_name = "_remotedebugging", + .m_name = "_remote_debugging", .m_size = -1, .m_methods = methods, }; PyMODINIT_FUNC -PyInit__remotedebugging(void) +PyInit__remote_debugging(void) { PyObject* mod = PyModule_Create(&module); if (mod == NULL) { diff --git a/PCbuild/_remotedebugging.vcxproj b/PCbuild/_remote_debugging.vcxproj similarity index 97% rename from PCbuild/_remotedebugging.vcxproj rename to PCbuild/_remote_debugging.vcxproj index a16079f7c6c869..c55f2908e03d33 100644 --- a/PCbuild/_remotedebugging.vcxproj +++ b/PCbuild/_remote_debugging.vcxproj @@ -68,7 +68,7 @@ {4D7C112F-3083-4D9E-9754-9341C14D9B39} - _remotedebugging + _remote_debugging Win32Proj false @@ -93,7 +93,7 @@ <_ProjectFileVersion>10.0.30319.1 - + diff --git a/PCbuild/_remotedebugging.vcxproj.filters b/PCbuild/_remote_debugging.vcxproj.filters similarity index 90% rename from PCbuild/_remotedebugging.vcxproj.filters rename to PCbuild/_remote_debugging.vcxproj.filters index 888e2cd478aa4e..ce4437f74e00cd 100644 --- a/PCbuild/_remotedebugging.vcxproj.filters +++ b/PCbuild/_remote_debugging.vcxproj.filters @@ -9,7 +9,7 @@ - + diff --git a/PCbuild/pcbuild.proj b/PCbuild/pcbuild.proj index c2c8b6f4a9e98a..da603eed1b332f 100644 --- a/PCbuild/pcbuild.proj +++ b/PCbuild/pcbuild.proj @@ -66,7 +66,7 @@ - + diff --git a/PCbuild/pcbuild.sln b/PCbuild/pcbuild.sln index d2bfb9472b10ee..4f1e1e046301c3 100644 --- a/PCbuild/pcbuild.sln +++ b/PCbuild/pcbuild.sln @@ -81,7 +81,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_testclinic", "_testclinic. EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_testinternalcapi", "_testinternalcapi.vcxproj", "{900342D7-516A-4469-B1AD-59A66E49A25F}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_remotedebugging", "_remotedebugging.vcxproj", "{4D7C112F-3083-4D9E-9754-9341C14D9B39}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_remote_debugging", "_remote_debugging.vcxproj", "{4D7C112F-3083-4D9E-9754-9341C14D9B39}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_testimportmultiple", "_testimportmultiple.vcxproj", "{36D0C52C-DF4E-45D0-8BC7-E294C3ABC781}" EndProject diff --git a/configure b/configure index 0dcfa345d267c1..7161b8eb224e58 100755 --- a/configure +++ b/configure @@ -692,8 +692,6 @@ MODULE__TKINTER_FALSE MODULE__TKINTER_TRUE MODULE__SQLITE3_FALSE MODULE__SQLITE3_TRUE -MODULE__REMOTEDEBUGGING_FALSE -MODULE__REMOTEDEBUGGING_TRUE MODULE_READLINE_FALSE MODULE_READLINE_TRUE MODULE__GDBM_FALSE @@ -793,6 +791,8 @@ MODULE__STRUCT_FALSE MODULE__STRUCT_TRUE MODULE_SELECT_FALSE MODULE_SELECT_TRUE +MODULE__REMOTE_DEBUGGING_FALSE +MODULE__REMOTE_DEBUGGING_TRUE MODULE__RANDOM_FALSE MODULE__RANDOM_TRUE MODULE__QUEUE_FALSE @@ -31072,7 +31072,7 @@ case $ac_sys_system in #( py_cv_module__ctypes_test=n/a - py_cv_module__remotedebugging=n/a + py_cv_module__remote_debugging=n/a py_cv_module__testimportmultiple=n/a py_cv_module__testmultiphase=n/a py_cv_module__testsinglephase=n/a @@ -31394,6 +31394,28 @@ then : +fi + + + if test "$py_cv_module__remote_debugging" != "n/a" +then : + py_cv_module__remote_debugging=yes +fi + if test "$py_cv_module__remote_debugging" = yes; then + MODULE__REMOTE_DEBUGGING_TRUE= + MODULE__REMOTE_DEBUGGING_FALSE='#' +else + MODULE__REMOTE_DEBUGGING_TRUE='#' + MODULE__REMOTE_DEBUGGING_FALSE= +fi + + as_fn_append MODULE_BLOCK "MODULE__REMOTE_DEBUGGING_STATE=$py_cv_module__remote_debugging$as_nl" + if test "x$py_cv_module__remote_debugging" = xyes +then : + + + + fi @@ -33132,46 +33154,6 @@ fi printf "%s\n" "$py_cv_module_readline" >&6; } - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for stdlib extension module _remotedebugging" >&5 -printf %s "checking for stdlib extension module _remotedebugging... " >&6; } - if test "$py_cv_module__remotedebugging" != "n/a" -then : - - if test "$TEST_MODULES" = yes -then : - if true -then : - py_cv_module__remotedebugging=yes -else case e in #( - e) py_cv_module__remotedebugging=missing ;; -esac -fi -else case e in #( - e) py_cv_module__remotedebugging=disabled ;; -esac -fi - -fi - as_fn_append MODULE_BLOCK "MODULE__REMOTEDEBUGGING_STATE=$py_cv_module__remotedebugging$as_nl" - if test "x$py_cv_module__remotedebugging" = xyes -then : - - - - -fi - if test "$py_cv_module__remotedebugging" = yes; then - MODULE__REMOTEDEBUGGING_TRUE= - MODULE__REMOTEDEBUGGING_FALSE='#' -else - MODULE__REMOTEDEBUGGING_TRUE='#' - MODULE__REMOTEDEBUGGING_FALSE= -fi - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $py_cv_module__remotedebugging" >&5 -printf "%s\n" "$py_cv_module__remotedebugging" >&6; } - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for stdlib extension module _sqlite3" >&5 printf %s "checking for stdlib extension module _sqlite3... " >&6; } if test "$py_cv_module__sqlite3" != "n/a" @@ -34291,6 +34273,10 @@ if test -z "${MODULE__RANDOM_TRUE}" && test -z "${MODULE__RANDOM_FALSE}"; then as_fn_error $? "conditional \"MODULE__RANDOM\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${MODULE__REMOTE_DEBUGGING_TRUE}" && test -z "${MODULE__REMOTE_DEBUGGING_FALSE}"; then + as_fn_error $? "conditional \"MODULE__REMOTE_DEBUGGING\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${MODULE_SELECT_TRUE}" && test -z "${MODULE_SELECT_FALSE}"; then as_fn_error $? "conditional \"MODULE_SELECT\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -34475,10 +34461,6 @@ if test -z "${MODULE_READLINE_TRUE}" && test -z "${MODULE_READLINE_FALSE}"; then as_fn_error $? "conditional \"MODULE_READLINE\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -if test -z "${MODULE__REMOTEDEBUGGING_TRUE}" && test -z "${MODULE__REMOTEDEBUGGING_FALSE}"; then - as_fn_error $? "conditional \"MODULE__REMOTEDEBUGGING\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi if test -z "${MODULE__SQLITE3_TRUE}" && test -z "${MODULE__SQLITE3_FALSE}"; then as_fn_error $? "conditional \"MODULE__SQLITE3\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 diff --git a/configure.ac b/configure.ac index 1f59261b615df6..abdf8813074bed 100644 --- a/configure.ac +++ b/configure.ac @@ -7755,7 +7755,7 @@ AS_CASE([$ac_sys_system], dnl (see Modules/Setup.stdlib.in). PY_STDLIB_MOD_SET_NA( [_ctypes_test], - [_remotedebugging], + [_remote_debugging], [_testimportmultiple], [_testmultiphase], [_testsinglephase], @@ -7849,6 +7849,7 @@ PY_STDLIB_MOD_SIMPLE([_pickle]) PY_STDLIB_MOD_SIMPLE([_posixsubprocess]) PY_STDLIB_MOD_SIMPLE([_queue]) PY_STDLIB_MOD_SIMPLE([_random]) +PY_STDLIB_MOD_SIMPLE([_remote_debugging]) PY_STDLIB_MOD_SIMPLE([select]) PY_STDLIB_MOD_SIMPLE([_struct]) PY_STDLIB_MOD_SIMPLE([_types]) @@ -8077,7 +8078,6 @@ PY_STDLIB_MOD([_gdbm], PY_STDLIB_MOD([readline], [], [test "$with_readline" != "no"], [$READLINE_CFLAGS], [$READLINE_LIBS]) -PY_STDLIB_MOD([_remotedebugging], [test "$TEST_MODULES" = yes]) PY_STDLIB_MOD([_sqlite3], [test "$have_sqlite3" = "yes"], [test "$have_supported_sqlite3" = "yes"], From 163b8e4c93d474a033414bf7769e79a5eeaec25a Mon Sep 17 00:00:00 2001 From: Adam Turner <9087854+aa-turner@users.noreply.github.com> Date: Sun, 4 May 2025 21:42:37 +0100 Subject: [PATCH 4/4] make regen-stdlib-module-names --- Python/stdlib_module_names.h | 1 + 1 file changed, 1 insertion(+) diff --git a/Python/stdlib_module_names.h b/Python/stdlib_module_names.h index 92cc5afedc8429..56e349a544c079 100644 --- a/Python/stdlib_module_names.h +++ b/Python/stdlib_module_names.h @@ -71,6 +71,7 @@ static const char* _Py_stdlib_module_names[] = { "_pyrepl", "_queue", "_random", +"_remote_debugging", "_scproxy", "_sha1", "_sha2",