From b3cb2cc9b7406415b86ca2310d082f1c349b8554 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Wed, 2 Oct 2024 23:28:50 +0900 Subject: [PATCH] Get rid of distutils ... because it was removed in Python 3.12 . Change-Id: Ib98623ff328c0823c614b6a9d3a6d9c11d356510 --- zaqar/common/transport/wsgi/helpers.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/zaqar/common/transport/wsgi/helpers.py b/zaqar/common/transport/wsgi/helpers.py index 3f1f9523e..3077034e5 100644 --- a/zaqar/common/transport/wsgi/helpers.py +++ b/zaqar/common/transport/wsgi/helpers.py @@ -15,13 +15,13 @@ """wsgi transport helpers.""" -from distutils import version import re from stevedore import driver import uuid import falcon from oslo_log import log as logging +from oslo_utils import versionutils from zaqar.common import urls from zaqar import context @@ -101,9 +101,8 @@ def extract_project_id(req, resp, params): u'string. Specify the right header ' u'X-PROJECT-ID and retry.')) - api_version = version.LooseVersion(api_version_string) - if (not params['project_id'] and api_version >= - version.LooseVersion('v1.1')): + if not params['project_id'] and versionutils.is_compatible( + 'v1.1', api_version_string, same_major=False): raise falcon.HTTPBadRequest('Project-Id Missing', _(u'The header X-PROJECT-ID was missing'))