summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoshua Li <josh@jrl.ninja>2020-06-02 20:01:37 -0700
committerBrian May <brian@linuxpenguins.xyz>2020-06-03 14:30:37 +1000
commit1db3281c168e4d87b3640443fd3e9b1afaed6809 (patch)
tree952122d319b577adf42d3619844d0cd752e234b3
parentbef54e778d87dacc9baefeb7c71318cf1d5e233d (diff)
shutil.which is 3.3+
-rw-r--r--sshuttle/server.py6
1 files changed, 1 insertions, 5 deletions
diff --git a/sshuttle/server.py b/sshuttle/server.py
index 37f942a..3234659 100644
--- a/sshuttle/server.py
+++ b/sshuttle/server.py
@@ -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