Remove distutils usage (#1177)

distutils is getting deprecated soon. Let's replace it with suggested
alternatives as suggested in:
https://www.python.org/dev/peps/pep-0632/

Remove `requests` version check and related code from url_helper.py
as the versions specified are old enough to no longer be relevant.

Signed-off-by: Shreenidhi Shedi <sshedi@vmware.com>

1 files changed, 6 insertions, 4 deletions

diff --git a/setup.py b/setup.py
index e6405ad9..c98a4703 100755
--- a/setup.py
+++ b/setup.py
@@ -15,13 +15,17 @@ import shutil
 import subprocess
 import sys
 import tempfile
-from distutils.errors import DistutilsArgError
 from glob import glob
 
 import setuptools
 from setuptools.command.egg_info import egg_info
 from setuptools.command.install import install
 
+try:
+    from setuptools.errors import DistutilsError
+except ImportError:
+    from distutils.errors import DistutilsArgError as DistutilsError
+
 RENDERED_TMPD_PREFIX = "RENDERED_TEMPD"
 VARIANT = None
 
@@ -245,9 +249,7 @@ class InitsysInstallData(install):
 
         bad = [f for f in self.init_system if f not in INITSYS_TYPES]
         if len(bad) != 0:
-            raise DistutilsArgError(
-                "Invalid --init-system: %s" % ",".join(bad)
-            )
+            raise DistutilsError("Invalid --init-system: %s" % ",".join(bad))
 
         for system in self.init_system:
             # add data files for anything that starts with '<system>.'