extern/sshuttle
1
1
Fork 0
mirror of https://github.com/sshuttle/sshuttle.git synced 2024-11-24 17:04:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

replace psutil with os

Browse Source
This commit is contained in:
Kyle 2021-06-23 21:53:03 -04:00
parent 78b80709f2
commit c06581cf83
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
setup.py
View File

@ -63,7 +63,6 @@ setup(
}, },
python_requires='>=3.6', python_requires='>=3.6',
install_requires=[ install_requires=[
'psutil',
], ],
tests_require=[ tests_require=[
'pytest', 'pytest',

5
sshuttle/client.py
View File

@ -6,7 +6,6 @@ import subprocess as ssubprocess
import os import os
import sys import sys
import platform import platform
import psutil
import sshuttle.helpers as helpers import sshuttle.helpers as helpers
import sshuttle.ssnet as ssnet 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 # poll() won't tell us when process exited since the
# process is no longer our child (it returns 0 all the # process is no longer our child (it returns 0 all the
# time). # 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.' % raise Fatal('ssh connection to server (pid %d) exited.' %
serverproc.pid) serverproc.pid)
else: else: