Skip to content

gh-76785: Rename _xxsubinterpreters to _interpreters #117791

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ericsnowcurrently merged 8 commits into from
Apr 24, 2024
Merged

gh-76785: Rename _xxsubinterpreters to _interpreters #117791

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b2e18c4
_xxsubinterpreters -> _interpreters
ericsnowcurrently Apr 11, 2024
0ba1dcc
_xxinterpqueues -> _interpqueues
ericsnowcurrently Apr 11, 2024
6631de7
_xxinterpchannels -> _interpchannels
ericsnowcurrently Apr 11, 2024
53c3f5c
Refresh the list of stdlib module names.
ericsnowcurrently Apr 12, 2024
3603028
Add a NEWS entry.
ericsnowcurrently Apr 12, 2024
222cc1e
Rename the low-level test files.
ericsnowcurrently Apr 12, 2024
f96fe75
Update Misc/NEWS.d/next/Library/2024-04-11-18-11-37.gh-issue-76785.BW…
ericsnowcurrently Apr 12, 2024
94401f0
Merge branch 'main' into rename-lowlevel-module
ericsnowcurrently Apr 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
_xxinterpqueues -> _interpqueues
  • Loading branch information
@ericsnowcurrently
ericsnowcurrently committed Apr 11, 2024
commit 0ba1dcc7f847ca217ca6170939345c2aafe04a3d
4 changes: 2 additions & 2 deletions Lib/test/support/interpreters/queues.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
import queue
import time
import weakref
import _xxinterpqueues as _queues
import _interpqueues as _queues

# aliases:
from _xxinterpqueues import (
from _interpqueues import (
QueueError, QueueNotFoundError,
)

Expand Down
2 changes: 1 addition & 1 deletion Lib/test/test_interpreters/test_queues.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

from test.support import import_helper, Py_DEBUG
# Raise SkipTest if subinterpreters not supported.
_queues = import_helper.import_module('_xxinterpqueues')
_queues = import_helper.import_module('_interpqueues')
from test.support import interpreters
from test.support.interpreters import queues
from .utils import _run_output, TestBase as _TestBase
Expand Down
2 changes: 1 addition & 1 deletion Makefile.pre.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1685,7 +1685,7 @@ Modules/signalmodule.o: $(srcdir)/Modules/signalmodule.c $(srcdir)/Modules/posix

Modules/_interpretersmodule.o: $(srcdir)/Modules/_interpretersmodule.c $(srcdir)/Modules/_interpreters_common.h

Modules/_xxinterpqueuesmodule.o: $(srcdir)/Modules/_xxinterpqueuesmodule.c $(srcdir)/Modules/_interpreters_common.h
Modules/_interpqueuesmodule.o: $(srcdir)/Modules/_interpqueuesmodule.c $(srcdir)/Modules/_interpreters_common.h

Modules/_xxinterpchannelsmodule.o: $(srcdir)/Modules/_xxinterpchannelsmodule.c $(srcdir)/Modules/_interpreters_common.h

Expand Down
2 changes: 1 addition & 1 deletion Modules/Setup
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,7 @@ PYTHONPATH=$(COREPYTHONPATH)
#_datetime _datetimemodule.c
#_decimal _decimal/_decimal.c
#_heapq _heapqmodule.c
#_interpqueues _interpqueuesmodule.c
#_interpreters _interpretersmodule.c
#_json _json.c
#_lsprof _lsprof.c rotatingtree.c
Expand Down Expand Up @@ -273,7 +274,6 @@ PYTHONPATH=$(COREPYTHONPATH)
# Testing

#_xxinterpchannels _xxinterpchannelsmodule.c
#_xxinterpqueues _xxinterpqueuesmodule.c
#_xxtestfuzz _xxtestfuzz/_xxtestfuzz.c _xxtestfuzz/fuzzer.c
#_testbuffer _testbuffer.c
#_testinternalcapi _testinternalcapi.c
Expand Down
2 changes: 1 addition & 1 deletion Modules/Setup.stdlib.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
# build supports subinterpreters
@MODULE__INTERPRETERS_TRUE@_interpreters _interpretersmodule.c
@MODULE__XXINTERPCHANNELS_TRUE@_xxinterpchannels _xxinterpchannelsmodule.c
@MODULE__XXINTERPQUEUES_TRUE@_xxinterpqueues _xxinterpqueuesmodule.c
@MODULE__INTERPQUEUES_TRUE@_interpqueues _interpqueuesmodule.c

@MODULE__ZONEINFO_TRUE@_zoneinfo _zoneinfo.c

Expand Down
2 changes: 1 addition & 1 deletion Modules/_xxinterpqueuesmodule.c → Modules/_interpqueuesmodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#undef REGISTERS_HEAP_TYPES


#define MODULE_NAME _xxinterpqueues
#define MODULE_NAME _interpqueues
#define MODULE_NAME_STR Py_STRINGIFY(MODULE_NAME)
#define MODINIT_FUNC_NAME RESOLVE_MODINIT_FUNC_NAME(MODULE_NAME)

Expand Down
4 changes: 2 additions & 2 deletions PC/config.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ extern PyObject* PyInit__weakref(void);
extern PyObject* PyInit_xxsubtype(void);
extern PyObject* PyInit__interpreters(void);
extern PyObject* PyInit__xxinterpchannels(void);
extern PyObject* PyInit__xxinterpqueues(void);
extern PyObject* PyInit__interpqueues(void);
extern PyObject* PyInit__random(void);
extern PyObject* PyInit_itertools(void);
extern PyObject* PyInit__collections(void);
Expand Down Expand Up @@ -141,7 +141,7 @@ struct _inittab _PyImport_Inittab[] = {
{"xxsubtype", PyInit_xxsubtype},
{"_interpreters", PyInit__interpreters},
{"_xxinterpchannels", PyInit__xxinterpchannels},
{"_xxinterpqueues", PyInit__xxinterpqueues},
{"_interpqueues", PyInit__interpqueues},
#ifdef _Py_HAVE_ZLIB
{"zlib", PyInit_zlib},
#endif
Expand Down
2 changes: 1 addition & 1 deletion PCbuild/pythoncore.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -467,7 +467,7 @@
<ClCompile Include="..\Modules\xxsubtype.c" />
<ClCompile Include="..\Modules\_interpretersmodule.c" />
<ClCompile Include="..\Modules\_xxinterpchannelsmodule.c" />
<ClCompile Include="..\Modules\_xxinterpqueuesmodule.c" />
<ClCompile Include="..\Modules\_interpqueuesmodule.c" />
<ClCompile Include="..\Modules\_io\fileio.c" />
<ClCompile Include="..\Modules\_io\bytesio.c" />
<ClCompile Include="..\Modules\_io\stringio.c" />
Expand Down
2 changes: 1 addition & 1 deletion PCbuild/pythoncore.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1553,7 +1553,7 @@
<ClCompile Include="..\Modules\_xxinterpchannelsmodule.c">
<Filter>Modules</Filter>
</ClCompile>
<ClCompile Include="..\Modules\_xxinterpqueuesmodule.c">
<ClCompile Include="..\Modules\_interpqueuesmodule.c">
<Filter>Modules</Filter>
</ClCompile>
<ClCompile Include="..\Parser\string_parser.c">
Expand Down
1 change: 0 additions & 1 deletion Tools/build/generate_stdlib_module_names.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@
'_testsinglephase',
'_testexternalinspection',
'_xxinterpchannels',
'_xxinterpqueues',
'_xxtestfuzz',
'idlelib.idle_test',
'test',
Expand Down
2 changes: 1 addition & 1 deletion Tools/c-analyzer/cpython/ignored.tsv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ Python/pylifecycle.c fatal_error reentrant -

# explicitly protected, internal-only
Modules/_xxinterpchannelsmodule.c - _globals -
Modules/_xxinterpqueuesmodule.c - _globals -
Modules/_interpqueuesmodule.c - _globals -

# set once during module init
Modules/_decimal/_decimal.c - minalloc_is_set -
Expand Down
28 changes: 14 additions & 14 deletions configure
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7394,7 +7394,7 @@ AS_CASE([$ac_sys_system],
[_tkinter],
[_interpreters],
[_xxinterpchannels],
[_xxinterpqueues],
[_interpqueues],
[grp],
[pwd],
[resource],
Expand Down Expand Up @@ -7519,7 +7519,7 @@ PY_STDLIB_MOD_SIMPLE([_struct])
PY_STDLIB_MOD_SIMPLE([_typing])
PY_STDLIB_MOD_SIMPLE([_interpreters])
PY_STDLIB_MOD_SIMPLE([_xxinterpchannels])
PY_STDLIB_MOD_SIMPLE([_xxinterpqueues])
PY_STDLIB_MOD_SIMPLE([_interpqueues])
PY_STDLIB_MOD_SIMPLE([_zoneinfo])

dnl multiprocessing modules
Expand Down