Remove distutils

This removes all distutils usage.
jd · Aug 9, 2024 · 21cb95c · 21cb95c
1 parent d37bae2
commit 21cb95c
Show file tree

Hide file tree

Showing 4 changed files with 60 additions and 60 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -11,7 +11,7 @@ RUN apt-get update -y && apt-get install -qy gnupg software-properties-common
 RUN add-apt-repository -y ppa:deadsnakes/ppa
 RUN apt-get -qq update -y \
     && apt-get install -y mysql-server redis-server zookeeper nodejs npm ceph librados-dev \
-          python3 python3-dev python3-pip python3.9 python3.9-dev python3.9-distutils \
+          python3 python3-dev python3-pip python3.9 python3.9-dev \
           gcc liberasurecode-dev liberasurecode1 postgresql libpq-dev python3-rados git wget memcached \
     && rm -rf /var/lib/apt/lists/*
 

diff --git a/pifpaf/drivers/__init__.py b/pifpaf/drivers/__init__.py
@@ -16,12 +16,12 @@
 import os
 import re
 import select
+import shutil
 import socket
 import subprocess
 import sys
 import threading
 import time
-from distutils import spawn
 
 import fixtures
 
@@ -102,7 +102,7 @@ def _kill(self, parent):
     def find_executable(filename, extra_paths):
         paths = extra_paths + os.getenv('PATH', os.defpath).split(os.pathsep)
         for path in paths:
-            loc = spawn.find_executable(filename, path)
+            loc = shutil.which(filename, path=path)
             if loc is not None:
                 return loc
 

diff --git a/pifpaf/tests/test_cli.py b/pifpaf/tests/test_cli.py
@@ -12,9 +12,9 @@
 # limitations under the License.
 
 import os
+import shutil
 import signal
 import subprocess
-from distutils import spawn
 
 import fixtures
 
@@ -23,7 +23,7 @@
 
 class TestCli(testtools.TestCase):
 
-    @testtools.skipUnless(spawn.find_executable("memcached"),
+    @testtools.skipUnless(shutil.which("memcached"),
                           "memcached not found")
     def test_cli(self):
         self.assertEqual(0, os.system(
@@ -39,7 +39,7 @@ def _read_stdout_and_kill(stdout):
                 signal.SIGTERM)
         return env
 
-    @testtools.skipUnless(spawn.find_executable("memcached"),
+    @testtools.skipUnless(shutil.which("memcached"),
                           "memcached not found")
     def test_eval(self):
         c = subprocess.Popen(["pifpaf", "run", "memcached", "--port", "11219"],
@@ -53,7 +53,7 @@ def test_eval(self):
         self.assertEqual(b"\"memcached://localhost:11219\";",
                          env[b"export PIFPAF_MEMCACHED_URL"])
 
-    @testtools.skipUnless(spawn.find_executable("memcached"),
+    @testtools.skipUnless(shutil.which("memcached"),
                           "memcached not found")
     def test_exit_code(self):
         c = subprocess.Popen(["pifpaf", "run", "memcached", "--port", "11234",
@@ -62,7 +62,7 @@ def test_exit_code(self):
         (stdout, stderr) = c.communicate()
         self.assertEqual(31, c.wait())
 
-    @testtools.skipUnless(spawn.find_executable("memcached"),
+    @testtools.skipUnless(shutil.which("memcached"),
                           "memcached not found")
     def test_env_prefix(self):
         c = subprocess.Popen(["pifpaf", "run",
@@ -81,7 +81,7 @@ def test_env_prefix(self):
         self.assertEqual(env[b"export PIFPAF_PID"],
                          env[b"export FOOBAR_PID"])
 
-    @testtools.skipUnless(spawn.find_executable("memcached"),
+    @testtools.skipUnless(shutil.which("memcached"),
                           "memcached not found")
     def test_env_prefix_old_format(self):
         # Old format
@@ -101,7 +101,7 @@ def test_env_prefix_old_format(self):
         self.assertEqual(env[b"export PIFPAF_PID"],
                          env[b"export FOOBAR_PID"])
 
-    @testtools.skipUnless(spawn.find_executable("memcached"),
+    @testtools.skipUnless(shutil.which("memcached"),
                           "memcached not found")
     def test_global_urls_variable(self):
         c = subprocess.Popen(["pifpaf", "run",
@@ -124,7 +124,7 @@ def test_global_urls_variable(self):
             b"\"memcached://localhost:11217;memcached://localhost:11218\";",
             env[b"export PIFPAF_URLS"])
 
-    @testtools.skipUnless(spawn.find_executable("memcached"),
+    @testtools.skipUnless(shutil.which("memcached"),
                           "memcached not found")
     def test_global_urls_variable_old_format(self):
         c = subprocess.Popen(["pifpaf",