Browse code

Avoid distutils usage at runtime

Matthias Klose authored on 2018/05/01 07:00:05
Showing 1 changed files
... ...
@@ -57,7 +57,7 @@ import tempfile
57 57
 from copy import copy
58 58
 from optparse import OptionParser, Option, OptionValueError, IndentedHelpFormatter
59 59
 from logging import debug, info, warning, error
60
-from distutils.spawn import find_executable
60
+from shutil import which
61 61
 
62 62
 from ssl import SSLError
63 63
 import io
... ...
@@ -2274,7 +2274,7 @@ def run_configure(config_file, args):
2274 2274
         ]
2275 2275
     ## Option-specfic defaults
2276 2276
     if getattr(cfg, "gpg_command") == "":
2277
-        setattr(cfg, "gpg_command", find_executable("gpg"))
2277
+        setattr(cfg, "gpg_command", which("gpg"))
2278 2278
 
2279 2279
     if getattr(cfg, "proxy_host") == "" and os.getenv("http_proxy"):
2280 2280
         autodetected_encoding = locale.getpreferredencoding() or "UTF-8"