Commits

Ronny Pfannschmidt committed b8c1282

stuff

Comments (0)

Files changed (3)

popen-flush

-# HG changeset patch
-# Parent 0545c861b937f75bb83d6f3490d3b9a70d14b021
-diff --git a/execnet/gateway.py b/execnet/gateway.py
---- a/execnet/gateway.py
-+++ b/execnet/gateway.py
-@@ -250,13 +250,10 @@ class PopenGateway(PopenCmdGateway):
- 
-     def _remote_bootstrap_gateway(self, io):
-         sendexec(io,
--                 "import sys",
--                 "sys.stdout.write('1')",
--                 "sys.stdout.flush()",
--                 popen_bootstrapline)
--        sendexec(io,
-             "import sys ; sys.path.insert(0, %r)" % importdir,
-             "from execnet.gateway_base import serve, init_popen_io",
-+             "sys.stdout.write('1')",
-+             "sys.stdout.flush()",
-             "serve(init_popen_io(), id='%s-slave')" % self.id,
-         )
-         s = io.read(1)

popen-sendexec-at-once

+# HG changeset patch
+# Parent 0fc772da5025c84b8c79e074ca6d8fe35dfb6830
+the popen gateway only needs a single sendexec
+
+diff --git a/execnet/gateway.py b/execnet/gateway.py
+--- a/execnet/gateway.py
++++ b/execnet/gateway.py
+@@ -250,13 +250,11 @@ class PopenGateway(PopenCmdGateway):
+ 
+     def _remote_bootstrap_gateway(self, io):
+         sendexec(io,
+-                 "import sys",
+-                 "sys.stdout.write('1')",
+-                 "sys.stdout.flush()",
+-                 popen_bootstrapline)
+-        sendexec(io,
+-            "import sys ; sys.path.insert(0, %r)" % importdir,
++            "import sys",
++            "sys.path.insert(0, %r)" % importdir,
+             "from execnet.gateway_base import serve, init_popen_io",
++            "sys.stdout.write('1')",
++            "sys.stdout.flush()",
+             "serve(init_popen_io(), id='%s-slave')" % self.id,
+         )
+         s = io.read(1)
 strconfig-decouple-effects
 socketserver-rexec
 io-wait-kill
+popen-sendexec-at-once
 io-creation-split
-popen-flush
 find-globals-no-ast