1berry/cpython
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GH-91048: Minor fixes for `_remotedebugging & rename to _remote_debugging` (#133398)

Browse Source
This commit is contained in:
Adam Turner 2025-05-05 01:30:14 +01:00 committed by GitHub
parent 483d130e50
commit 3f80165a26
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
14 changed files with 48 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Lib/asyncio/tools.py
View File

@ -5,7 +5,7 @@ from collections import defaultdict
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):

11
Lib/test/test_external_inspection.py
View File

@ -15,13 +15,12 @@ import subprocess
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 _remotedebuggingmodule is available")
raise unittest.SkipTest("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)

2
Lib/test/test_sys.py
View File

@ -1960,7 +1960,7 @@ def _supports_remote_attaching():
PROCESS_VM_READV_SUPPORTED = False
try:
from _remotedebuggingmodule import PROCESS_VM_READV_SUPPORTED
from _remote_debugging import PROCESS_VM_READV_SUPPORTED
except ImportError:
pass

2
Modules/Setup
View File

@ -284,10 +284,10 @@ PYTHONPATH=$(COREPYTHONPATH)
#*shared*
#_ctypes_test _ctypes/_ctypes_test.c
#_remote_debugging _remote_debugging_module.c
#_testcapi _testcapimodule.c
#_testimportmultiple _testimportmultiple.c
#_testmultiphase _testmultiphase.c
#_remotedebugging _remotedebuggingmodule.c
#_testsinglephase _testsinglephase.c
# ---

2
Modules/Setup.stdlib.in
View File

@ -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__REMOTE_DEBUGGING_TRUE@_remote_debugging _remote_debugging_module.c
@MODULE__STRUCT_TRUE@_struct _struct.c
# build supports subinterpreters

4
Modules/_remotedebuggingmodule.c → Modules/_remote_debugging_module.c
View File

@ -1775,13 +1775,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) {

4
PCbuild/_remotedebugging.vcxproj → PCbuild/_remote_debugging.vcxproj
View File

@ -68,7 +68,7 @@
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{4D7C112F-3083-4D9E-9754-9341C14D9B39}</ProjectGuid>
<RootNamespace>_remotedebugging</RootNamespace>
<RootNamespace>_remote_debugging</RootNamespace>
<Keyword>Win32Proj</Keyword>
<SupportPGO>false</SupportPGO>
</PropertyGroup>
@ -93,7 +93,7 @@
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
</PropertyGroup>
<ItemGroup>
<ClCompile Include="..\Modules\_remotedebuggingmodule.c" />
<ClCompile Include="..\Modules\_remote_debugging_module.c" />
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="..\PC\python_nt.rc" />

2
PCbuild/_remotedebugging.vcxproj.filters → PCbuild/_remote_debugging.vcxproj.filters
View File

@ -9,7 +9,7 @@
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\Modules\_remotedebuggingmodule.c" />
<ClCompile Include="..\Modules\_remote_debugging_module.c" />
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="..\PC\python_nt.rc">

2
PCbuild/pcbuild.proj
View File

@ -66,7 +66,7 @@
<!-- pyshellext.dll -->
<Projects Include="pyshellext.vcxproj" />
<!-- Extension modules -->
<ExtensionModules Include="_asyncio;_remotedebugging;_zoneinfo;_decimal;_elementtree;_multiprocessing;_overlapped;pyexpat;_queue;select;unicodedata;winsound;_uuid;_wmi" />
<ExtensionModules Include="_asyncio;_decimal;_elementtree;_multiprocessing;_overlapped;pyexpat;_queue;_remote_debugging;select;unicodedata;winsound;_uuid;_wmi;_zoneinfo" />
<ExtensionModules Include="_ctypes" Condition="$(IncludeCTypes)" />
<!-- Extension modules that require external sources -->
<ExternalModules Include="_bz2;_lzma;_sqlite3" />

2
PCbuild/pcbuild.sln
View File

@ -163,7 +163,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_testlimitedcapi", "_testli
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib-ng", "zlib-ng.vcxproj", "{FB91C8B2-6FBC-3A01-B644-1637111F902D}"
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
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution

1
Python/stdlib_module_names.h generated
View File

@ -71,6 +71,7 @@ static const char* _Py_stdlib_module_names[] = {
"_pyrepl",
"_queue",
"_random",
"_remote_debugging",
"_scproxy",
"_sha1",
"_sha2",

1
Tools/build/generate_stdlib_module_names.py
View File

@ -34,7 +34,6 @@ IGNORE = {
'_testlimitedcapi',
'_testmultiphase',
'_testsinglephase',
'_remotedebugging',
'_xxtestfuzz',
'idlelib.idle_test',
'test',

76
configure generated vendored
View File

@ -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
@ -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
@ -33877,46 +33899,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"
@ -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
@ -34551,10 +34537,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

4
configure.ac
View File

@ -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])
@ -8122,7 +8123,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],