nomore pylib

Author: RonnyPfannschmidt

.pre-commit-config.yaml

@@ -1,4 +1,4 @@
-exclude: doc/en/example/py2py3/test_py2.py
+
 repos:
 -   repo: https://github.com/codespell-project/codespell
     rev: v2.2.2
@@ -28,7 +28,7 @@ repos:
     rev: v3.9.0
     hooks:
     -   id: reorder-python-imports
-        args: ['--application-directories=execnet', --py37-plus]
+        args: ['--application-directories=execnet', --py37-plus, "--remove-import=import py"]
 -   repo: https://github.com/PyCQA/doc8
     rev: 'v1.1.1'
     hooks:

doc/example/conftest.py

@@ -1,14 +1,19 @@
+import os
 import sys
+from pathlib import Path
 
-import py
 
+def _add_path(path: Path):
+    strpath = os.fspath(path)
+    if strpath not in sys.path:
+        sys.path.insert(0, strpath)
+
+
+mydir = Path(__file__).parent
 # make execnet and example code importable
-cand = py.path.local(__file__).dirpath().dirpath().dirpath()
-if cand.join("execnet", "__init__.py").check():
-    if str(cand) not in sys.path:
-        sys.path.insert(0, str(cand))
-cand = py.path.local(__file__).dirpath()
-if str(cand) not in sys.path:
-    sys.path.insert(0, str(cand))
 
+cand = mydir.parent.parent
+if cand.joinpath("execnet", "__init__.py").is_file():
+    _add_path(cand)
+_add_path(mydir)
 pytest_plugins = ["doctest"]

doc/example/svn-sync-repo.py

@@ -10,7 +10,6 @@
 import sys
 
 import execnet
-import py
 
 
 parser = optparse.OptionParser(usage=__doc__)
@@ -34,14 +33,15 @@
 
 
 def parsehosts(path):
-    path = py.path.local(path)
+    host_regex = re.compile(r"Host\s*(\S+)")
     l = []
-    rex = re.compile(r"Host\s*(\S+)")
-    for line in path.readlines():
-        m = rex.match(line)
-        if m is not None:
-            (sshname,) = m.groups()
-            l.append(sshname)
+
+    with open(path) as fp:
+        for line in fp:
+            m = rex.match(line)
+            if m is not None:
+                (sshname,) = m.groups()
+                l.append(sshname)
     return l
 
 

doc/example/sysinfo.py

@@ -20,6 +20,7 @@
 import weakref
 from io import BytesIO
 from typing import Callable
+from typing import IO
 
 
 def reraise(cls, val, tb):
@@ -961,7 +962,7 @@ def log(*msg):
     def _terminate_execution(self):
         pass
 
-    def _send(self, msgcode, channelid=0, data=b""):
+    def _send(self, msgcode, channelid: int = 0, data: bytes = b""):
         message = Message(msgcode, channelid, data)
         try:
             message.to_io(self._io)

execnet/gateway_base.py

@@ -32,29 +32,12 @@ def kill(self):
 
 def killpopen(popen):
     try:
-        if hasattr(popen, "kill"):
-            popen.kill()
-        else:
-            killpid(popen.pid)
-    except OSError:
-        sys.stderr.write("ERROR killing: %s\n" % (sys.exc_info()[1]))
+        popen.kill()
+    except OSError as e:
+        sys.stderr.write("ERROR killing: %s\n" % e)
         sys.stderr.flush()
 
 
-def killpid(pid):
-    if hasattr(os, "kill"):
-        os.kill(pid, 15)
-    elif sys.platform == "win32" or getattr(os, "_name", None) == "nt":
-        import ctypes
-
-        PROCESS_TERMINATE = 1
-        handle = ctypes.windll.kernel32.OpenProcess(PROCESS_TERMINATE, False, pid)
-        ctypes.windll.kernel32.TerminateProcess(handle, -1)
-        ctypes.windll.kernel32.CloseHandle(handle)
-    else:
-        raise OSError(f"no method to kill {pid}")
-
-
 popen_bootstrapline = "import sys;exec(eval(sys.stdin.readline()))"
 
 
@@ -72,10 +55,8 @@ def shell_split_path(path):
 def popen_args(spec):
     args = shell_split_path(spec.python) if spec.python else [sys.executable]
     args.append("-u")
-    if spec is not None and spec.dont_write_bytecode:
+    if spec.dont_write_bytecode:
         args.append("-B")
-    # Slight gymnastics in ordering these arguments because CPython (as of
-    # 2.7.1) ignores -B if you provide `python -c "something" -B`
     args.extend(["-c", popen_bootstrapline])
     return args
 

execnet/gateway_io.py

@@ -3,6 +3,8 @@
 
 (c) 2008-2014, Holger Krekel and others
 """
+from __future__ import annotations
+
 import atexit
 import sys
 from functools import partial
@@ -280,16 +282,16 @@ def putreceived(obj, channel=ch):
                     ch.setcallback(putreceived, endmarker=endmarker)
             return self._queue
 
-    def waitclose(self):
-        first = None
+    def waitclose(self) -> None:
+        first: Exception | None = None
         for ch in self._channels:
             try:
                 ch.waitclose()
-            except ch.RemoteError:
+            except ch.RemoteError as e:
                 if first is None:
-                    first = sys.exc_info()
-        if first:
-            reraise(*first)
+                    first = e
+        if first is not None:
+            raise first
 
 
 def safe_terminate(execmodel, timeout, list_of_paired_functions):

execnet/multi.py

@@ -55,3 +55,7 @@ version-file = "execnet/_version.py"
 include = [
     "/execnet",
 ]
+
+
+[tool.mypy]
+python_version = "3.7"

pyproject.toml

@@ -1,8 +1,10 @@
 import subprocess
 import sys
+from functools import lru_cache
+from typing import Callable
+from typing import Iterator
 
-import execnet
-import py
+import execnet.gateway
 import pytest
 from execnet.gateway_base import get_execmodel
 from execnet.gateway_base import WorkerPool
@@ -22,10 +24,15 @@ def pytest_runtest_setup(item):
 
 
 @pytest.fixture
-def makegateway(request):
+def group_function() -> Iterator[execnet.Group]:
     group = execnet.Group()
-    request.addfinalizer(lambda: group.terminate(0.5))
-    return group.makegateway
+    yield group
+    group.terminate(0.5)
+
+
+@pytest.fixture
+def makegateway(group_function) -> Callable[[str], execnet.gateway.Gateway]:
+    return group_function.makegateway
 
 
 pytest_plugins = ["pytester", "doctest"]
@@ -76,7 +83,7 @@ def getspecssh(config):
     xspecs = getgspecs(config)
     for spec in xspecs:
         if spec.ssh:
-            if not py.path.local.sysfind("ssh"):
+            if not shutil.which("ssh"):
                 pytest.skip("command not found: ssh")
             return spec
     pytest.skip("need '--gx ssh=...'")
@@ -100,36 +107,18 @@ def pytest_generate_tests(metafunc):
         else:
             gwtypes = ["popen", "socket", "ssh", "proxy"]
         metafunc.parametrize("gw", gwtypes, indirect=True)
-    elif "anypython" in metafunc.fixturenames:
-        metafunc.parametrize(
-            "anypython",
-            indirect=True,
-            argvalues=("sys.executable", "pypy3"),
-        )
 
 
-def getexecutable(name, cache={}):
-    try:
-        return cache[name]
-    except KeyError:
-        if name == "sys.executable":
-            return py.path.local(sys.executable)
-        executable = py.path.local.sysfind(name)
-        if executable:
-            if name == "jython":
-                popen = subprocess.Popen(
-                    [str(executable), "--version"],
-                    universal_newlines=True,
-                    stderr=subprocess.PIPE,
-                )
-                out, err = popen.communicate()
-                if not err or "2.5" not in err:
-                    executable = None
-        cache[name] = executable
-        return executable
+@lru_cache()
+def getexecutable(name):
+    if name == "sys.executable":
+        return sys.executable
+    import shutil
 
+    return shutil.which(name)
 
-@pytest.fixture
+
+@pytest.fixture(params=("sys.executable", "pypy3"))
 def anypython(request):
     name = request.param
     executable = getexecutable(name)