Add Queue.

python · ericsnowcurrently · Feb 28, 2024 · Feb 13, 2024 · Feb 13, 2024 · Feb 13, 2024
commit cc4dc35216efeac179046b0c29831e6de69e18f2
diff --git a/Lib/test/support/interpreters/__init__.py b/Lib/test/support/interpreters/__init__.py
@@ -16,22 +16,27 @@
     'Interpreter',
     'InterpreterError', 'InterpreterNotFoundError', 'ExecFailure',
     'NotShareableError',
-    'create_shared_queue', 'SharedQueue', 'QueueEmpty', 'QueueFull',
+    'create_shared_queue', 'create_queue',
+    'SharedQueue', 'Queue',
+    'QueueEmpty', 'QueueFull',
 ]
 
 
 _queuemod = None
 
 def __getattr__(name):
     if name in ('QueueEmpty', 'QueueFull',
-                'SharedQueue', 'create_shared_queue'):
+                'SharedQueue', 'create_shared_queue',
+                'Queue', 'create_queue'):
         global QueueEmpty, QueueFull
         global create_shared_queue, SharedQueue
+        global create_queue, Queue
         ns = globals()
         from .queues import (
             QueueEmpty, QueueFull,
             create_shared as create_shared_queue,
-            SharedQueue,
+            create as create_queue,
+            SharedQueue, Queue,
         )
         return ns[name]
     else:

diff --git a/Lib/test/support/interpreters/queues.py b/Lib/test/support/interpreters/queues.py
@@ -11,8 +11,8 @@
 )
 
 __all__ = [
-    'create_shared', 'list_all',
-    'SharedQueue',
+    'create_shared', 'create', 'list_all',
+    'SharedQueue', 'Queue',
     'QueueError', 'QueueNotFoundError', 'QueueEmpty', 'QueueFull',
 ]
 
@@ -35,15 +35,29 @@ def create_shared(maxsize=0):
     """Return a new cross-interpreter queue.
 
     The queue may be used to pass data safely between interpreters.
+    Only "shareable" objects put into the queue.  The data is handled
+    with maximum efficiency.
     """
-    qid = _queues.create(maxsize)
+    qid = _queues.create(maxsize, sharedonly=True)
     return SharedQueue(qid)
 
 
+def create(maxsize=0):
+    """Return a new cross-interpreter queue.
+
+    The queue may be used to pass data safely between interpreters.
+    Any object may be put into the queue.  Each is serialized, and thus
+    copied.  This approach is not as efficient as queues made with
+    create_shared().
+    """
+    qid = _queues.create(maxsize, sharedonly=False)
+    return Queue(qid)
+
+
 def list_all():
     """Return a list of all open queues."""
-    return [SharedQueue(qid)
-            for qid in _queues.list_all()]
+    return [SharedQueue(qid) if sharedonly else Queue(qid)
+            for qid, sharedonly in _queues.list_all()]
 
 
 
@@ -109,6 +123,8 @@ def put(self, obj, timeout=None, *,
             ):
         """Add the object to the queue.
 
+        The object must be "shareable".
+
         This blocks while the queue is full.
         """
         if timeout is not None:
@@ -169,4 +185,18 @@ def get_nowait(self):
             raise  # re-raise
 
 
+class Queue(SharedQueue):
+    """A cross-interpreter queue."""
+
+    def put(self, obj, timeout=None):
+        """Add the object to the queue.
+
+        All objects are supported.
+
+        This blocks while the queue is full.
+        """
+        super().put(obj, timeout)
+
+
 _queues._register_queue_type(SharedQueue)
+_queues._register_queue_type(Queue)