From 8041fc2b4399fe4dc14b37325ee4e26505c9f26b Mon Sep 17 00:00:00 2001 From: Steve Kowalik Date: Wed, 4 Oct 2023 12:36:02 +1100 Subject: [PATCH] Stop using distutils distutils is due to be removed in Python 3.12, but even so we don't need to use it, since the sysconfig module can handle our use-cases just fine for all supported Python versions. --- plugins/asyncio/uwsgiplugin.py | 6 +++--- plugins/gevent/uwsgiplugin.py | 6 +++--- plugins/greenlet/uwsgiplugin.py | 6 +++--- plugins/python/uwsgiplugin.py | 6 +++--- plugins/pyuwsgi/uwsgiplugin.py | 6 +++--- plugins/stackless/uwsgiplugin.py | 6 +++--- plugins/tornado/uwsgiplugin.py | 6 +++--- setup.cpyext.py | 3 +-- uwsgiconfig.py | 3 +-- 9 files changed, 23 insertions(+), 25 deletions(-) diff --git a/plugins/asyncio/uwsgiplugin.py b/plugins/asyncio/uwsgiplugin.py index 7cb17f54eb..eff6c62c43 100644 --- a/plugins/asyncio/uwsgiplugin.py +++ b/plugins/asyncio/uwsgiplugin.py @@ -1,10 +1,10 @@ -from distutils import sysconfig +import sysconfig NAME = 'asyncio' CFLAGS = [ - '-I' + sysconfig.get_python_inc(), - '-I' + sysconfig.get_python_inc(plat_specific=True) + '-I' + sysconfig.get_path('include'), + '-I' + sysconfig.get_path('platinclude') ] LDFLAGS = [] LIBS = [] diff --git a/plugins/gevent/uwsgiplugin.py b/plugins/gevent/uwsgiplugin.py index 4ff550a9f9..4d97e1ad17 100644 --- a/plugins/gevent/uwsgiplugin.py +++ b/plugins/gevent/uwsgiplugin.py @@ -1,10 +1,10 @@ -from distutils import sysconfig +import sysconfig NAME = 'gevent' CFLAGS = [ - '-I' + sysconfig.get_python_inc(), - '-I' + sysconfig.get_python_inc(plat_specific=True) + '-I' + sysconfig.get_path('include'), + '-I' + sysconfig.get_path('platinclude') ] LDFLAGS = [] LIBS = [] diff --git a/plugins/greenlet/uwsgiplugin.py b/plugins/greenlet/uwsgiplugin.py index 27b1da1235..c5ba154271 100644 --- a/plugins/greenlet/uwsgiplugin.py +++ b/plugins/greenlet/uwsgiplugin.py @@ -1,10 +1,10 @@ -from distutils import sysconfig +import sysconfig NAME = 'greenlet' CFLAGS = [ - '-I' + sysconfig.get_python_inc(), - '-I' + sysconfig.get_python_inc(plat_specific=True) + '-I' + sysconfig.get_path('include'), + '-I' + sysconfig.get_path('platinclude') ] LDFLAGS = [] LIBS = [] diff --git a/plugins/python/uwsgiplugin.py b/plugins/python/uwsgiplugin.py index e3765c997b..63a7653cb1 100644 --- a/plugins/python/uwsgiplugin.py +++ b/plugins/python/uwsgiplugin.py @@ -1,7 +1,7 @@ import os import sys -from distutils import sysconfig +import sysconfig def get_python_version(): @@ -31,8 +31,8 @@ def get_python_version(): ] CFLAGS = [ - '-I' + sysconfig.get_python_inc(), - '-I' + sysconfig.get_python_inc(plat_specific=True), + '-I' + sysconfig.get_path('include'), + '-I' + sysconfig.get_path('platinclude'), ] LDFLAGS = [] diff --git a/plugins/pyuwsgi/uwsgiplugin.py b/plugins/pyuwsgi/uwsgiplugin.py index 4b6bce042a..3cdb99ddb8 100644 --- a/plugins/pyuwsgi/uwsgiplugin.py +++ b/plugins/pyuwsgi/uwsgiplugin.py @@ -1,4 +1,4 @@ -from distutils import sysconfig +import sysconfig import os, sys os.environ['UWSGI_PYTHON_NOLIB'] = '1' @@ -6,8 +6,8 @@ NAME = 'pyuwsgi' CFLAGS = [ - '-I' + sysconfig.get_python_inc(), - '-I' + sysconfig.get_python_inc(plat_specific=True), + '-I' + sysconfig.get_path('include'), + '-I' + sysconfig.get_path('platinclude'), ] LDFLAGS = [] LIBS = [] diff --git a/plugins/stackless/uwsgiplugin.py b/plugins/stackless/uwsgiplugin.py index d720e2b9bd..61a11e0e90 100644 --- a/plugins/stackless/uwsgiplugin.py +++ b/plugins/stackless/uwsgiplugin.py @@ -1,10 +1,10 @@ -from distutils import sysconfig +import sysconfig NAME = 'stackless' CFLAGS = [ - '-I' + sysconfig.get_python_inc(), - '-I' + sysconfig.get_python_inc(plat_specific=True), + '-I' + sysconfig.get_path('include'), + '-I' + sysconfig.get_path('platinclude'), ] LDFLAGS = [] LIBS = [] diff --git a/plugins/tornado/uwsgiplugin.py b/plugins/tornado/uwsgiplugin.py index c0179b609b..15a2460b1b 100644 --- a/plugins/tornado/uwsgiplugin.py +++ b/plugins/tornado/uwsgiplugin.py @@ -1,10 +1,10 @@ -from distutils import sysconfig +import sysconfig NAME = 'tornado' CFLAGS = [ - '-I' + sysconfig.get_python_inc(), - '-I' + sysconfig.get_python_inc(plat_specific=True), + '-I' + sysconfig.get_path('include'), + '-I' + sysconfig.get_path('platinclude'), ] LDFLAGS = [] LIBS = [] diff --git a/setup.cpyext.py b/setup.cpyext.py index c29b1d3a9a..9a238d7ab0 100644 --- a/setup.cpyext.py +++ b/setup.cpyext.py @@ -12,9 +12,8 @@ import shlex import uwsgiconfig -from setuptools import setup +from setuptools import setup, Extension from setuptools.command.build_ext import build_ext -from distutils.core import Extension class uWSGIBuildExt(build_ext): diff --git a/uwsgiconfig.py b/uwsgiconfig.py index 344e0a941d..26a5297a53 100644 --- a/uwsgiconfig.py +++ b/uwsgiconfig.py @@ -12,6 +12,7 @@ import sys import subprocess +import sysconfig from threading import Thread, Lock from optparse import OptionParser @@ -20,8 +21,6 @@ except ImportError: from Queue import Queue -from distutils import sysconfig - try: import ConfigParser except ImportError: