Make interpreters.queues private.

Author: ericsnowcurrently

Lib/concurrent/futures/interpreter.py

@@ -167,7 +167,7 @@ def run(self, task):
             except _interpqueues.QueueError:
                 continue
             except ModuleNotFoundError:
-                # interpreters.queues doesn't exist, which means
+                # interpreters._queues doesn't exist, which means
                 # QueueEmpty doesn't.  Act as though it does.
                 continue
             else:

Lib/interpreters/__init__.py

@@ -26,7 +26,7 @@ def __getattr__(name):
     if name in ('Queue', 'QueueEmpty', 'QueueFull', 'create_queue'):
         global create_queue, Queue, QueueEmpty, QueueFull
         ns = globals()
-        from .queues import (
+        from ._queues import (
             create as create_queue,
             Queue, QueueEmpty, QueueFull,
         )

Lib/interpreters/_crossinterp.py

@@ -61,7 +61,7 @@ def __new__(cls):
 
     def __repr__(self):
         return f'{self._MODULE}.{self._NAME}'
-#        return f'interpreters.queues.UNBOUND'
+#        return f'interpreters._queues.UNBOUND'
 
 
 UNBOUND = object.__new__(UnboundItem)

Lib/interpreters/queues.py Lib/interpreters/_queues.pyLib/interpreters/queues.py renamed to Lib/interpreters/_queues.py

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

Lib/test/test_concurrent_futures/test_interpreter_pool.py

@@ -8,7 +8,7 @@
 # Raise SkipTest if subinterpreters not supported.
 _queues = import_helper.import_module('_interpqueues')
 import interpreters
-from interpreters import queues, _crossinterp
+from 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
+            from 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
+            from 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
+                        from 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
+                from 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
+            from 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
+            from 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
+            from interpreters import _queues as queues
             queue = queues.Queue({queue.id})
             obj2 = queue.get()
             obj1 = queue.get()

Lib/test/test_interpreters/test_queues.py

@@ -136,7 +136,7 @@ idarg_int64_converter(PyObject *arg, void *ptr)
 static int
 ensure_highlevel_module_loaded(void)
 {
-    PyObject *highlevel = PyImport_ImportModule("interpreters.queues");
+    PyObject *highlevel = PyImport_ImportModule("interpreters._queues");
     if (highlevel == NULL) {
         return -1;
     }