Fix the Interpreter.run() signature.

Author: ericsnowcurrently

Lib/test/support/interpreters.py

@@ -92,13 +92,19 @@ def close(self):
         return _interpreters.destroy(self._id)
 
     # XXX Rename "run" to "exec"?
-    def run(self, src_str, /, channels=None):
+    # XXX Do not allow init to overwrite (by default)?
+    def run(self, src_str, /, *, init=None):
         """Run the given source code in the interpreter.
 
         This is essentially the same as calling the builtin "exec"
         with this interpreter, using the __dict__ of its __main__
         module as both globals and locals.
 
+        If "init" is provided, it must be a dict mapping attribute names
+        to "shareable" objects, including channels.  These are set as
+        attributes on the __main__ module before the given code is
+        executed.  If a name is already bound then it is overwritten.
+
         There is no return value.
 
         If the code raises an unhandled exception then a RunFailedError
@@ -110,7 +116,7 @@ def run(self, src_str, /, channels=None):
         that time, the previous interpreter is allowed to run
         in other threads.
         """
-        _interpreters.exec(self._id, src_str, channels)
+        _interpreters.exec(self._id, src_str, init)
 
 
 def create_channel():

Lib/test/test_interpreters.py

@@ -39,10 +39,10 @@ def clean_up_interpreters():
             pass  # already destroyed
 
 
-def _run_output(interp, request, channels=None):
+def _run_output(interp, request, init=None):
     script, rpipe = _captured_script(request)
     with rpipe:
-        interp.run(script, channels=channels)
+        interp.run(script, init=init)
         return rpipe.read()
 
 
@@ -953,7 +953,7 @@ def test_send_recv_different_interpreters(self):
                 print(id(orig2))
                 s.send_nowait(orig2)
                 """),
-            channels=dict(r=r1, s=s2),
+            init=dict(r=r1, s=s2),
             )
         obj2 = r2.recv()
 
@@ -1027,7 +1027,7 @@ def test_send_recv_nowait_different_interpreters(self):
                 print(id(orig2))
                 s.send_nowait(orig2)
                 """),
-            channels=dict(r=r1, s=s2),
+            init=dict(r=r1, s=s2),
             )
         obj2 = r2.recv_nowait()