1
1
mirror of https://github.com/sshuttle/sshuttle.git synced 2025-07-07 02:01:36 +02:00

shutil.which is 3.3+

This commit is contained in:
Joshua Li
2020-06-02 20:01:37 -07:00
committed by Brian May
parent bef54e778d
commit 1db3281c16

@ -6,6 +6,7 @@ import time
import sys
import os
import platform
from shutil import which
import sshuttle.ssnet as ssnet
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, \
resolvconf_random_nameserver
try:
from shutil import which
except ImportError:
from distutils.spawn import find_executable as which
def _ipmatch(ipstr):
# FIXME: IPv4 only