diff options
author | Brian May <brian@linuxpenguins.xyz> | 2021-06-25 15:06:39 +1000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-06-25 15:06:39 +1000 |
commit | ee02e1aaa20b03e565f4142b9e2598a6f893a8c4 (patch) | |
tree | 8c1ad4f85eecefc0ce7298e9c9153d7152e72558 | |
parent | 78b80709f2f902d7866cc4fb9ff203a6d863457b (diff) | |
parent | c06581cf83fdbf34269a3a3b42daa28b55ae4129 (diff) |
Merge pull request #656 from kylekyle/master
replace psutil with os
-rwxr-xr-x | setup.py | 1 | ||||
-rw-r--r-- | sshuttle/client.py | 5 |
2 files changed, 3 insertions, 3 deletions
@@ -63,7 +63,6 @@ setup( }, python_requires='>=3.6', install_requires=[ - 'psutil', ], tests_require=[ 'pytest', diff --git a/sshuttle/client.py b/sshuttle/client.py index 349ad86..ef4f36b 100644 --- a/sshuttle/client.py +++ b/sshuttle/client.py @@ -6,7 +6,6 @@ import subprocess as ssubprocess import os import sys import platform -import psutil import sshuttle.helpers as helpers import sshuttle.ssnet as ssnet @@ -650,7 +649,9 @@ def _main(tcp_listener, udp_listener, fw, ssh_cmd, remotename, # poll() won't tell us when process exited since the # process is no longer our child (it returns 0 all the # time). - if not psutil.pid_exists(serverproc.pid): + try: + os.kill(serverproc.pid, 0) + except OSError: raise Fatal('ssh connection to server (pid %d) exited.' % serverproc.pid) else: |