interpreters -> concurrent.interpreters

Author: ericsnowcurrently

.github/CODEOWNERS

@@ -281,13 +281,13 @@ Doc/howto/clinic.rst          @erlend-aasland
 # Subinterpreters
 **/*interpreteridobject.*     @ericsnowcurrently
 **/*crossinterp*              @ericsnowcurrently
-Lib/interpreters/             @ericsnowcurrently
 Modules/_interp*module.c      @ericsnowcurrently
-Lib/test/test_interpreters/   @ericsnowcurrently
 Lib/test/test__interp*.py     @ericsnowcurrently
+Lib/concurrent/interpreters/  @ericsnowcurrently
 Lib/test/support/channels.py  @ericsnowcurrently
+Doc/library/concurrent.interpreters.rst  @ericsnowcurrently
+Lib/test/test_interpreters/   @ericsnowcurrently
 Lib/concurrent/futures/interpreter.py  @ericsnowcurrently
-Doc/library/interpreters.rst  @ericsnowcurrently
 
 # Android
 **/*Android*                  @mhsmith @freakboy3742

Doc/library/concurrency.rst

@@ -18,13 +18,12 @@ multitasking). Here's an overview:
    multiprocessing.shared_memory.rst
    concurrent.rst
    concurrent.futures.rst
+   concurrent.interpreters.rst
    subprocess.rst
    sched.rst
    queue.rst
    contextvars.rst
 
-Also see the :mod:`interpreters` module.
-
 
 The following are support modules for some of the above services:
 

Doc/library/interpreters.rst renamed to Doc/library/concurrent.interpreters.rst

@@ -1,24 +1,24 @@
-:mod:`!interpreters` --- Multiple Interpreters in the Same Process
-==================================================================
+:mod:`concurrent.!interpreters` --- Multiple Interpreters in the Same Process
+=============================================================================
 
-.. module:: interpreters
+.. module:: concurrent.interpreters
    :synopsis: Multiple Interpreters in the Same Process
 
 .. moduleauthor:: Eric Snow <ericsnowcurrently@gmail.com>
 .. sectionauthor:: Eric Snow <ericsnowcurrently@gmail.com>
 
 .. versionadded:: 3.14
 
-**Source code:** :source:`Lib/interpreters/__init__.py`
+**Source code:** :source:`Lib/concurrent/interpreters.py`
 
 --------------
 
 
 Introduction
 ------------
 
-The :mod:`!interpreters` module constructs higher-level interfaces
-on top of the lower level :mod:`!_interpreters` module.
+The :mod:`!concurrent.interpreters` module constructs higher-level
+interfaces on top of the lower level :mod:`!_interpreters` module.
 
 .. XXX Add references to the upcoming HOWTO docs in the seealso block.
 
@@ -167,7 +167,7 @@ Basic Usage
 
 Creating an interpreter and running code in it::
 
-    import interpreters
+    from concurrent import interpreters
 
     interp = interpreters.create()
 

Doc/library/concurrent.rst

@@ -1,6 +1,7 @@
 The :mod:`!concurrent` package
 ==============================
 
-Currently, there is only one module in this package:
+Currently, there are only two modules in this package:
 
 * :mod:`concurrent.futures` -- Launching parallel tasks
+* :mod:`concurrent.interpreters` -- Multiple interpreters in the same process

Doc/library/python.rst

@@ -17,7 +17,6 @@ overview:
    builtins.rst
    __main__.rst
    warnings.rst
-   interpreters.rst
    dataclasses.rst
    contextlib.rst
    abc.rst
@@ -28,3 +27,8 @@ overview:
    inspect.rst
    annotationlib.rst
    site.rst
+
+.. seealso::
+
+   * See the :mod:`concurrent.interpreters` module, which similarly
+     exposes core runtime functionality.

Doc/whatsnew/3.14.rst

@@ -135,7 +135,7 @@ Each of these separate copies is called an "interpreter".
 However, the feature has been available only through the C-API.
 
 That limitation is removed in the 3.14 release,
-with the new :mod:`interpreters` module!
+with the new :mod:`concurrent.interpreters` module!
 
 There are at least two notable reasons why using multiple interpreters
 is worth considering:

Lib/interpreters/__init__.py renamed to Lib/concurrent/interpreters/__init__.py

@@ -2,14 +2,14 @@
 
 import time
 import _interpchannels as _channels
-from interpreters import _crossinterp
+from concurrent.interpreters import _crossinterp
 
 # aliases:
 from _interpchannels import (
     ChannelError, ChannelNotFoundError, ChannelClosedError,  # noqa: F401
     ChannelEmptyError, ChannelNotEmptyError,  # noqa: F401
 )
-from interpreters._crossinterp import (
+from concurrent.interpreters._crossinterp import (
     UNBOUND_ERROR, UNBOUND_REMOVE,
 )
 

Lib/interpreters/_crossinterp.py renamed to Lib/concurrent/interpreters/_crossinterp.py

@@ -9,7 +9,7 @@
 from test.support import import_helper, skip_if_sanitizer
 
 _channels = import_helper.import_module('_interpchannels')
-from interpreters import _crossinterp
+from concurrent.interpreters import _crossinterp
 from test.test__interpreters import (
     _interpreters,
     _run_output,

Lib/interpreters/_queues.py renamed to Lib/concurrent/interpreters/_queues.py

@@ -8,7 +8,7 @@
 from concurrent.futures.interpreter import (
     ExecutionFailed, BrokenInterpreterPool,
 )
-from interpreters import _queues as queues
+from concurrent.interpreters import _queues as queues
 import _interpreters
 from test import support
 import test.test_asyncio.utils as testasyncio_utils

Lib/test/support/channels.py

@@ -13,11 +13,11 @@
 from test.support import import_helper
 # Raise SkipTest if subinterpreters not supported.
 _interpreters = import_helper.import_module('_interpreters')
-import interpreters
+from concurrent import interpreters
 from test.support import Py_GIL_DISABLED
 from test.support import force_not_colorized
 import test._crossinterp_definitions as defs
-from interpreters import (
+from concurrent.interpreters import (
     InterpreterError, InterpreterNotFoundError, ExecutionFailed,
 )
 from .utils import (
@@ -133,7 +133,7 @@ def test_in_subinterpreter(self):
         main, = interpreters.list_all()
         interp = interpreters.create()
         out = _run_output(interp, dedent("""
-            import interpreters
+            from concurrent import interpreters
             interp = interpreters.create()
             print(interp.id)
             """))
@@ -196,7 +196,7 @@ def test_subinterpreter(self):
         main = interpreters.get_main()
         interp = interpreters.create()
         out = _run_output(interp, dedent("""
-            import interpreters
+            from concurrent import interpreters
             cur = interpreters.get_current()
             print(cur.id)
             """))
@@ -213,7 +213,7 @@ def test_idempotent(self):
         with self.subTest('subinterpreter'):
             interp = interpreters.create()
             out = _run_output(interp, dedent("""
-                import interpreters
+                from concurrent import interpreters
                 cur = interpreters.get_current()
                 print(id(cur))
                 cur = interpreters.get_current()
@@ -225,7 +225,7 @@ def test_idempotent(self):
         with self.subTest('per-interpreter'):
             interp = interpreters.create()
             out = _run_output(interp, dedent("""
-                import interpreters
+                from concurrent import interpreters
                 cur = interpreters.get_current()
                 print(id(cur))
                 """))
@@ -582,7 +582,7 @@ def test_from_current(self):
         main, = interpreters.list_all()
         interp = interpreters.create()
         out = _run_output(interp, dedent(f"""
-            import interpreters
+            from concurrent import interpreters
             interp = interpreters.Interpreter({interp.id})
             try:
                 interp.close()
@@ -599,7 +599,7 @@ def test_from_sibling(self):
         self.assertEqual(set(interpreters.list_all()),
                          {main, interp1, interp2})
         interp1.exec(dedent(f"""
-            import interpreters
+            from concurrent import interpreters
             interp2 = interpreters.Interpreter({interp2.id})
             interp2.close()
             interp3 = interpreters.create()
@@ -806,7 +806,7 @@ def eggs():
                 ham()
             """)
         scriptfile = self.make_script('script.py', tempdir, text="""
-            import interpreters
+            from concurrent import interpreters
 
             def script():
                 import spam
@@ -827,7 +827,7 @@ def script():
                 ~~~~~~~~~~~^^^^^^^^
               {interpmod_line.strip()}
                 raise ExecutionFailed(excinfo)
-            interpreters.ExecutionFailed: RuntimeError: uh-oh!
+            concurrent.interpreters.ExecutionFailed: RuntimeError: uh-oh!
 
             Uncaught in the interpreter:
 
@@ -1281,7 +1281,7 @@ def run(text):
             # no module indirection
             with self.subTest('no indirection'):
                 text = run(f"""
-                    import interpreters
+                    from concurrent import interpreters
 
                     def spam():
                         # This a global var...
@@ -1301,7 +1301,7 @@ def run(interp, func):
                 """)
             with self.subTest('indirect as func, direct interp'):
                 text = run(f"""
-                    import interpreters
+                    from concurrent import interpreters
                     import mymod
 
                     def spam():
@@ -1317,7 +1317,7 @@ def spam():
 
             # indirect as func, indirect interp
             new_mod('mymod', f"""
-                import interpreters
+                from concurrent import interpreters
                 def run(func):
                     interp = interpreters.create()
                     return interp.call(func)

Lib/test/test__interpchannels.py

@@ -8,7 +8,7 @@
 from test.support import import_helper
 # Raise SkipTest if subinterpreters not supported.
 _channels = import_helper.import_module('_interpchannels')
-import interpreters
+from concurrent import interpreters
 from test.support import channels
 from .utils import _run_output, TestBase
 

Lib/test/test_concurrent_futures/test_interpreter_pool.py

@@ -119,7 +119,7 @@ def test_sys_path_0(self):
         # The main interpreter's sys.path[0] should be used by subinterpreters.
         script = '''
             import sys
-            import interpreters
+            from concurrent import interpreters
 
             orig = sys.path[0]
 
@@ -170,7 +170,7 @@ def test_gh_109793(self):
         # is reported, even when subinterpreters get cleaned up at the end.
         import subprocess
         argv = [sys.executable, '-c', '''if True:
-            import interpreters
+            from concurrent import interpreters
             interp = interpreters.create()
             raise Exception
             ''']

Lib/test/test_interpreters/test_api.py

@@ -7,8 +7,8 @@
 from test.support import import_helper, Py_DEBUG
 # Raise SkipTest if subinterpreters not supported.
 _queues = import_helper.import_module('_interpqueues')
-import interpreters
-from interpreters import _queues as queues, _crossinterp
+from concurrent import interpreters
+from concurrent.interpreters import _queues as queues, _crossinterp
 from .utils import _run_output, TestBase as _TestBase
 
 
@@ -126,7 +126,7 @@ def test_shareable(self):
 
         interp = interpreters.create()
         interp.exec(dedent(f"""
-            from interpreters import _queues as queues
+            from concurrent.interpreters import _queues as queues
             queue1 = queues.Queue({queue1.id})
             """));
 
@@ -324,7 +324,7 @@ def test_put_get_full_fallback(self):
     def test_put_get_same_interpreter(self):
         interp = interpreters.create()
         interp.exec(dedent("""
-            from interpreters import _queues as queues
+            from concurrent.interpreters import _queues as queues
             queue = queues.create()
             """))
         for methname in ('get', 'get_nowait'):
@@ -351,7 +351,7 @@ def test_put_get_different_interpreters(self):
                 out = _run_output(
                     interp,
                     dedent(f"""
-                        from interpreters import _queues as queues
+                        from concurrent.interpreters import _queues as queues
                         queue1 = queues.Queue({queue1.id})
                         queue2 = queues.Queue({queue2.id})
                         assert queue1.qsize() == 1, 'expected: queue1.qsize() == 1'
@@ -390,7 +390,7 @@ def common(queue, unbound=None, presize=0):
             interp = interpreters.create()
 
             _run_output(interp, dedent(f"""
-                from interpreters import _queues as queues
+                from concurrent.interpreters import _queues as queues
                 queue = queues.Queue({queue.id})
                 obj1 = b'spam'
                 obj2 = b'eggs'
@@ -468,7 +468,7 @@ def test_put_cleared_with_subinterpreter_mixed(self):
         queue = queues.create()
         interp = interpreters.create()
         _run_output(interp, dedent(f"""
-            from interpreters import _queues as queues
+            from concurrent.interpreters import _queues as queues
             queue = queues.Queue({queue.id})
             queue.put(1, unbounditems=queues.UNBOUND)
             queue.put(2, unbounditems=queues.UNBOUND_ERROR)
@@ -504,14 +504,14 @@ def test_put_cleared_with_subinterpreter_multiple(self):
 
         queue.put(1)
         _run_output(interp1, dedent(f"""
-            from interpreters import _queues as queues
+            from concurrent.interpreters import _queues as queues
             queue = queues.Queue({queue.id})
             obj1 = queue.get()
             queue.put(2, unbounditems=queues.UNBOUND)
             queue.put(obj1, unbounditems=queues.UNBOUND_REMOVE)
             """))
         _run_output(interp2, dedent(f"""
-            from interpreters import _queues as queues
+            from concurrent.interpreters import _queues as queues
             queue = queues.Queue({queue.id})
             obj2 = queue.get()
             obj1 = queue.get()

Lib/test/test_interpreters/test_channels.py

@@ -6,7 +6,7 @@
 from test.support import threading_helper
 # Raise SkipTest if subinterpreters not supported.
 import_helper.import_module('_interpreters')
-import interpreters
+from concurrent import interpreters
 from .utils import TestBase
 
 

Lib/test/test_interpreters/test_lifecycle.py

@@ -21,7 +21,7 @@
     import _interpreters
 except ImportError as exc:
     raise unittest.SkipTest(str(exc))
-import interpreters
+from concurrent import interpreters
 
 
 try:

Lib/test/test_interpreters/test_queues.py

@@ -24,7 +24,7 @@
 from test.support import force_not_colorized
 from test.support import SHORT_TIMEOUT
 try:
-    import interpreters
+    from concurrent import interpreters
 except ImportError:
     interpreters = None
 import textwrap

Lib/test/test_interpreters/test_stress.py

@@ -28,7 +28,7 @@
 from test import support
 
 try:
-    import interpreters
+    from concurrent import interpreters
 except ImportError:
     interpreters = None