diff --git a/CMakeLists.txt b/CMakeLists.txt index 5f44c3494..4aee99fb5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -19,7 +19,7 @@ ELSE () MESSAGE (FATAL_ERROR "Invalid PYTHON_DESIRED value: " ${PYTHON_DESIRED}) ENDIF() -EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "from sys import stdout; from distutils import sysconfig; stdout.write(sysconfig.get_python_lib())" OUTPUT_VARIABLE PYTHON_INSTALL_DIR) +EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "from sys import stdout; from sysconfig import get_path; stdout.write(get_path('purelib'))" OUTPUT_VARIABLE PYTHON_INSTALL_DIR) MESSAGE(STATUS "Python install dir is ${PYTHON_INSTALL_DIR}") ADD_SUBDIRECTORY (dnf) diff --git a/dnf/const.py.in b/dnf/const.py.in index 4ef2613ec..5c1fef0fd 100644 --- a/dnf/const.py.in +++ b/dnf/const.py.in @@ -19,7 +19,7 @@ # from __future__ import unicode_literals -import distutils.sysconfig +import sysconfig CONF_FILENAME='/etc/dnf/dnf.conf' # :api CONF_AUTOMATIC_FILENAME='/etc/dnf/automatic.conf' @@ -50,7 +50,7 @@ VERBOSE_LEVEL=6 PREFIX=NAME.lower() PROGRAM_NAME=NAME.lower() # Deprecated - no longer used, Argparser prints program name based on sys.argv PLUGINCONFPATH = '/etc/dnf/plugins' # :api -PLUGINPATH = '%s/dnf-plugins' % distutils.sysconfig.get_python_lib() +PLUGINPATH = '%s/dnf-plugins' % sysconfig.get_path('purelib') VERSION='@DNF_VERSION@' USER_AGENT = "dnf/%s" % VERSION diff --git a/dnf/persistor.py b/dnf/persistor.py index 9ab3ffbbf..d0deb42f5 100644 --- a/dnf/persistor.py +++ b/dnf/persistor.py @@ -26,7 +26,6 @@ from __future__ import absolute_import from __future__ import unicode_literals from dnf.i18n import _ -import distutils.version import dnf.util import errno import fnmatch