Skip to content

Commit

Permalink
pythongh-76785: Rename _xxsubinterpreters to _interpreters (pythongh-…
Browse files Browse the repository at this point in the history
  • Loading branch information
ericsnowcurrently authored Apr 24, 2024
1 parent af3c1d8 commit 03e3e31
Show file tree
Hide file tree
Showing 34 changed files with 550 additions and 543 deletions.
2 changes: 1 addition & 1 deletion Include/internal/pycore_atexit.h
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ struct atexit_state {
int callback_len;
};

// Export for '_xxinterpchannels' shared extension
// Export for '_interpchannels' shared extension
PyAPI_FUNC(int) _Py_AtExit(
PyInterpreterState *interp,
atexit_datacallbackfunc func,
Expand Down
2 changes: 1 addition & 1 deletion Include/internal/pycore_pybuffer.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ extern "C" {
#endif


// Exported for the _xxinterpchannels module.
// Exported for the _interpchannels module.
PyAPI_FUNC(int) _PyBuffer_ReleaseInInterpreter(
PyInterpreterState *interp, Py_buffer *view);
PyAPI_FUNC(int) _PyBuffer_ReleaseInInterpreterAndRawFree(
Expand Down
4 changes: 2 additions & 2 deletions Include/internal/pycore_pystate.h
Original file line number Diff line number Diff line change
Expand Up @@ -77,10 +77,10 @@ _Py_IsMainInterpreterFinalizing(PyInterpreterState *interp)
interp == &_PyRuntime._main_interpreter);
}

// Export for _xxsubinterpreters module.
// Export for _interpreters module.
PyAPI_FUNC(PyObject *) _PyInterpreterState_GetIDObject(PyInterpreterState *);

// Export for _xxsubinterpreters module.
// Export for _interpreters module.
PyAPI_FUNC(int) _PyInterpreterState_SetRunningMain(PyInterpreterState *);
PyAPI_FUNC(void) _PyInterpreterState_SetNotRunningMain(PyInterpreterState *);
PyAPI_FUNC(int) _PyInterpreterState_IsRunningMain(PyInterpreterState *);
Expand Down
4 changes: 2 additions & 2 deletions Include/internal/pycore_pythread.h
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ extern void _PyThread_AfterFork(struct _pythread_runtime_state *state);
// unset: -1 seconds, in nanoseconds
#define PyThread_UNSET_TIMEOUT ((PyTime_t)(-1 * 1000 * 1000 * 1000))

// Exported for the _xxinterpchannels module.
// Exported for the _interpchannels module.
PyAPI_FUNC(int) PyThread_ParseTimeoutArg(
PyObject *arg,
int blocking,
Expand All @@ -111,7 +111,7 @@ PyAPI_FUNC(int) PyThread_ParseTimeoutArg(
* are returned, depending on whether the lock can be acquired within the
* timeout.
*/
// Exported for the _xxinterpchannels module.
// Exported for the _interpchannels module.
PyAPI_FUNC(PyLockStatus) PyThread_acquire_lock_timed_with_retries(
PyThread_type_lock,
PY_TIMEOUT_T microseconds);
Expand Down
2 changes: 1 addition & 1 deletion Lib/test/support/import_helper.py
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ def multi_interp_extensions_check(enabled=True):
This only applies to modules that haven't been imported yet.
It overrides the PyInterpreterConfig.check_multi_interp_extensions
setting (see support.run_in_subinterp_with_config() and
_xxsubinterpreters.create()).
_interpreters.create()).
Also see importlib.utils.allowing_all_extensions().
"""
Expand Down
4 changes: 2 additions & 2 deletions Lib/test/support/interpreters/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@

import threading
import weakref
import _xxsubinterpreters as _interpreters
import _interpreters

# aliases:
from _xxsubinterpreters import (
from _interpreters import (
InterpreterError, InterpreterNotFoundError, NotShareableError,
is_shareable,
)
Expand Down
4 changes: 2 additions & 2 deletions Lib/test/support/interpreters/channels.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
"""Cross-interpreter Channels High Level Module."""

import time
import _xxinterpchannels as _channels
import _interpchannels as _channels

# aliases:
from _xxinterpchannels import (
from _interpchannels import (
ChannelError, ChannelNotFoundError, ChannelClosedError,
ChannelEmptyError, ChannelNotEmptyError,
)
Expand Down
4 changes: 2 additions & 2 deletions Lib/test/support/interpreters/queues.py
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
Loading

0 comments on commit 03e3e31

Please sign in to comment.