state

Author: RonnyPfannschmidt

.pre-commit-config.yaml

@@ -1,4 +1,3 @@
-
 repos:
 -   repo: https://github.com/codespell-project/codespell
     rev: v2.2.2
@@ -23,12 +22,12 @@ repos:
     rev: v3.3.1
     hooks:
     -   id: pyupgrade
-        args:  [--py37-plus]
+        args:  [--py38-plus]
 -   repo: https://github.com/asottile/reorder_python_imports
     rev: v3.9.0
     hooks:
     -   id: reorder-python-imports
-        args: ['--application-directories=execnet', --py37-plus, "--remove-import=import py"]
+        args: ['--application-directories=execnet', --py38-plus, "--remove-import=import py"]
 -   repo: https://github.com/PyCQA/doc8
     rev: 'v1.1.1'
     hooks:

pyproject.toml

@@ -93,5 +93,5 @@ sources = ["src"]
 
 
 [tool.mypy]
-python_version = "3.7"
+python_version = "3.8"
 mypy_path = "$MYPY_CONFIG_FILE_DIR/src"

src/execnet/gateway_base.py

@@ -18,20 +18,10 @@
 import sys
 import traceback
 import weakref
+from _thread import interrupt_main
 from io import BytesIO
 from typing import Callable
-from typing import IO
-
-
-def reraise(cls, val, tb):
-    raise val.with_traceback(tb)
-
-
-unicode = str
-_long_type = int
-from _thread import interrupt_main
 
-SUBPROCESS32 = False
 # f = open("/tmp/execnet-%s" % os.getpid(), "w")
 # def log_extra(*msg):
 #     f.write(" ".join([str(x) for x in msg]) + "\n")
@@ -46,9 +36,8 @@ def get_execmodel(backend):
         return backend
     if backend == "thread":
         importdef = {
-            "get_ident": ["thread::get_ident", "_thread::get_ident"],
+            "get_ident": ["_thread::get_ident"],
             "_start_new_thread": [
-                "thread::start_new_thread",
                 "_thread::start_new_thread",
             ],
             "threading": ["threading"],

src/execnet/gateway_bootstrap.py

@@ -2,6 +2,7 @@
 code to initialize the remote side of a gateway once the io is created
 """
 import inspect
+import json
 import os
 
 import execnet
@@ -23,13 +24,13 @@ def bootstrap_import(io, spec):
     sendexec(
         io,
         "import sys",
-        "if %r not in sys.path:" % importdir,
-        "    sys.path.insert(0, %r)" % importdir,
+        f"if {importdir!r} not in sys.path:",
+        f"    sys.path.insert(0, {importdir!r})",
         "from execnet.gateway_base import serve, init_popen_io, get_execmodel",
         "sys.stdout.write('1')",
         "sys.stdout.flush()",
-        "execmodel = get_execmodel(%r)" % spec.execmodel,
-        "serve(init_popen_io(execmodel), id='%s-worker')" % spec.id,
+        f"execmodel = get_execmodel({spec.execmodel!r})",
+        f"serve(init_popen_io(execmodel), id='{spec.id}-worker')",
     )
     s = io.read(1)
     assert s == b"1", repr(s)
@@ -75,7 +76,8 @@ def bootstrap_socket(io, id):
 
 def sendexec(io, *sources):
     source = "\n".join(sources)
-    io.write((repr(source) + "\n").encode("ascii"))
+    encoded = (json.dumps(source) + "\n").encode("ascii")
+    io.write(encoded)
 
 
 def fix_pid_for_jython_popen(gw):

src/execnet/gateway_io.py

@@ -38,7 +38,7 @@ def killpopen(popen):
         sys.stderr.flush()
 
 
-popen_bootstrapline = "import sys;exec(eval(sys.stdin.readline()))"
+popen_bootstrapline = "import sys;import json;exec(json.loads(sys.stdin.readline()))"
 
 
 def shell_split_path(path):

src/execnet/multi.py

@@ -14,7 +14,6 @@
 from . import gateway_io
 from .gateway_base import Channel
 from .gateway_base import get_execmodel
-from .gateway_base import reraise
 from .gateway_base import trace
 from .xspec import XSpec
 

testing/conftest.py

@@ -109,7 +109,7 @@ def pytest_generate_tests(metafunc):
         metafunc.parametrize("gw", gwtypes, indirect=True)
 
 
-@lru_cache()
+@lru_cache
 def getexecutable(name):
     if name == "sys.executable":
         return sys.executable

testing/test_basics.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 import inspect
+import json
 import os
 import subprocess
 import sys
@@ -86,7 +87,7 @@ def receive():
 
     try:
         source = f"{inspect.getsource(read_write_loop)}\n\nread_write_loop()"
-        repr_source = repr(str(source)) + "\n"
+        repr_source = json.dumps(source) + "\n"
         sendline = repr_source
         send(sendline)
         s = receive()