use packaging.version.Version replace distutils.version.StrictVersion

Olegt0rr · Aug 30, 2023 · 1dde0c4 · 1dde0c4
1 parent de4237a
commit 1dde0c4
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 13 deletions.
diff --git a/examples/falcon_test.py b/examples/falcon_test.py
@@ -1,17 +1,17 @@
 import json
 import os
-from distutils.version import StrictVersion
 from wsgiref import simple_server
 
 import falcon
+from packaging.version import Version
 
 
 class HelloWorldResource(object):
     def on_get(self, req, resp):
         resp.body = json.dumps({'text': 'Hello World!!!'})
 
 
-if StrictVersion(falcon.__version__) < StrictVersion('3.0.0'):
+if Version(falcon.__version__) < Version('3.0.0'):
     app = falcon.API()
 else:
     app = falcon.App()

diff --git a/setup.py b/setup.py
@@ -1,16 +1,16 @@
 import platform
-from distutils.version import StrictVersion
 from pathlib import Path
 
+from packaging.version import Version
 from setuptools import find_packages
 from setuptools import setup
 
-if StrictVersion(platform.python_version()) < StrictVersion('3.0.0'):
+if Version(platform.python_version()) < Version('3.0.0'):
     raise Exception("`swagger-ui-py` support python version >= 3.0.0 only.")
 
 setup(
     name='swagger-ui-py',
-    version='23.08.23',
+    version='23.8.23',
     description=(
         'Swagger UI for Python web framework, '
         'such as Tornado, Flask, Quart, Sanic and Falcon.'

diff --git a/swagger_ui/core.py b/swagger_ui/core.py
@@ -2,12 +2,12 @@
 import importlib
 import re
 import urllib.request
-from distutils.version import StrictVersion
 from pathlib import Path
 
 from jinja2 import Environment
 from jinja2 import FileSystemLoader
 from jinja2 import select_autoescape
+from packaging.version import Version
 
 from swagger_ui.handlers import supported_list
 from swagger_ui.utils import SWAGGER_UI_PY_ROOT
@@ -144,7 +144,7 @@ def get_config(self, host):
             config = _load_config(self.config_spec)
 
         version = config.get('openapi', '2.0.0')
-        if StrictVersion(version) >= StrictVersion('3.0.0'):
+        if Version(version) >= Version('3.0.0'):
             for server in config.get('servers', []):
                 server['url'] = re.sub(r'//[a-z0-9\-\.:]+/?',
                                        '//{}/'.format(host), server['url'])

diff --git a/swagger_ui/handlers/falcon.py b/swagger_ui/handlers/falcon.py
@@ -1,5 +1,7 @@
 import json
 
+from packaging.version import Version
+
 
 class FalconInterface(object):
     def __init__(self, use_async=False):
@@ -49,12 +51,10 @@ def on_get(self, req, resp):
 
 def match(doc):
     try:
-        from distutils.version import StrictVersion
-
         import falcon
 
         interface = None
-        if StrictVersion(falcon.__version__) >= StrictVersion('3.0.0'):
+        if Version(falcon.__version__) >= Version('3.0.0'):
             import falcon.asgi
             if isinstance(doc.app, falcon.asgi.App):
                 interface = FalconInterface(use_async=True)

diff --git a/test/falcon_test.py b/test/falcon_test.py
@@ -1,8 +1,7 @@
-from distutils.version import StrictVersion
-
 import falcon
 import pytest
 from falcon import testing
+from packaging.version import Version
 
 from swagger_ui import api_doc
 from swagger_ui import falcon_api_doc
@@ -17,7 +16,7 @@ class HelloWorldHandler(object):
         def on_get(self, req, resp):
             resp.body = 'Hello World!!!'
 
-    if StrictVersion(falcon.__version__) < StrictVersion('3.0.0'):
+    if Version(falcon.__version__) < Version('3.0.0'):
         app = falcon.API()
     else:
         app = falcon.App()