From 72fedaa53ce724316cf5fab9ef80736d2e1d83d8 Mon Sep 17 00:00:00 2001 From: Scott Date: Sat, 1 Jun 2024 06:49:38 -0700 Subject: [PATCH 1/2] remove ditutil dependency in utils.py --- src/amcrest/utils.py | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/amcrest/utils.py b/src/amcrest/utils.py index c01b195..0cd9185 100644 --- a/src/amcrest/utils.py +++ b/src/amcrest/utils.py @@ -14,13 +14,22 @@ from typing import List # pylint: disable=no-name-in-module -from distutils import util +#from distutils import util from typing import List, Tuple, Union DATEFMT = "%Y-%m-%d %H:%M:%S" PRECISION = 2 +def strtobool(value: str) -> bool: + """Convert string to boolean.""" + if s.lower() in ['yes', 'true', 't', 'y', '1']: + return True + elif s.lower() in ['no', 'false', 'f', 'n', '0']: + return False + else: + raise ValueError("Cannot convert {} to a bool".format(s)) + def clean_url(url: str) -> str: host = re.sub(r"^http[s]?://", "", url, flags=re.IGNORECASE) host = re.sub(r"/$", "", host) From 72bebf9a8f449bfccd2dc382cb57003a736dfe69 Mon Sep 17 00:00:00 2001 From: Scott Date: Sat, 1 Jun 2024 07:00:48 -0700 Subject: [PATCH 2/2] remove distutils from configure.ac --- configure.ac | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index d87b70b..b4dc08e 100644 --- a/configure.ac +++ b/configure.ac @@ -42,10 +42,7 @@ AC_PATH_PROG([PYTHON3], [python3], [no]) AC_SUBST([PYTHON3_PREFIX], ['${prefix}']) AC_SUBST([PYTHON3_EXEC_PREFIX], ['${exec_prefix}']) - PYTHON3_DIR=`$PYTHON3 -c "import distutils.sysconfig; \ - print(distutils.sysconfig.get_python_lib(0,0,prefix='$PYTHON3_PREFIX'))"` - PYTHON3_EXECDIR=`$PYTHON3 -c "import distutils.sysconfig; \ - print(distutils.sysconfig.get_python_lib(1,0,prefix='$PYTHON3_EXEC_PREFIX'))"` + AC_SUBST(PYTHON3_CFLAGS) AC_SUBST(PYTHON3_LIBS)