From 1db3281c168e4d87b3640443fd3e9b1afaed6809 Mon Sep 17 00:00:00 2001
From: Joshua Li <josh@jrl.ninja>
Date: Tue, 2 Jun 2020 20:01:37 -0700
Subject: shutil.which is 3.3+

---
 sshuttle/server.py | 6 +-----
 1 file changed, 1 insertion(+), 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
-- 
cgit v1.2.3