extern/sshuttle
1
1
Fork 0
mirror of https://github.com/sshuttle/sshuttle.git synced 2025-01-19 12:28:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

shutil.which is 3.3+

Browse Source
This commit is contained in:
Joshua Li 2020-06-02 20:01:37 -07:00 committed by Brian May
parent bef54e778d
commit 1db3281c16
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sshuttle/server.py
View File

@ -6,6 +6,7 @@ import time
import sys import sys
import os import os
import platform import platform
from shutil import which
import sshuttle.ssnet as ssnet import sshuttle.ssnet as ssnet
import sshuttle.helpers as helpers import sshuttle.helpers as helpers
@ -15,11 +16,6 @@ from sshuttle.ssnet import Handler, Proxy, Mux, MuxWrapper
from sshuttle.helpers import b, log, debug1, debug2, debug3, Fatal, \ from sshuttle.helpers import b, log, debug1, debug2, debug3, Fatal, \
resolvconf_random_nameserver resolvconf_random_nameserver
try:
from shutil import which
except ImportError:
from distutils.spawn import find_executable as which
def _ipmatch(ipstr): def _ipmatch(ipstr):
# FIXME: IPv4 only # FIXME: IPv4 only