From b3f0a0c5d0d5324595791f02bc3faae49cf1f15d Mon Sep 17 00:00:00 2001 From: Rongxin Liu Date: Tue, 17 Oct 2023 16:00:07 -0400 Subject: [PATCH] replaced distutils with packaging --- setup.py | 4 ++-- src/cs50/cs50.py | 1 - src/cs50/flask.py | 7 +++++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/setup.py b/setup.py index bd33a73..d9a2ee4 100644 --- a/setup.py +++ b/setup.py @@ -10,7 +10,7 @@ "Topic :: Software Development :: Libraries :: Python Modules" ], description="CS50 library for Python", - install_requires=["Flask>=1.0", "SQLAlchemy==1.4.46", "sqlparse", "termcolor", "wheel"], + install_requires=["Flask>=1.0", "packaging", "SQLAlchemy==1.4.46", "sqlparse", "termcolor", "wheel"], keywords="cs50", license="GPLv3", long_description_content_type="text/markdown", @@ -18,5 +18,5 @@ package_dir={"": "src"}, packages=["cs50"], url="https://github.com/cs50/python-cs50", - version="9.2.6" + version="9.2.7" ) diff --git a/src/cs50/cs50.py b/src/cs50/cs50.py index 16bfd0b..31313f8 100644 --- a/src/cs50/cs50.py +++ b/src/cs50/cs50.py @@ -6,7 +6,6 @@ import re import sys -from distutils.sysconfig import get_python_lib from os.path import abspath, join from termcolor import colored from traceback import format_exception diff --git a/src/cs50/flask.py b/src/cs50/flask.py index 324ec30..3668007 100644 --- a/src/cs50/flask.py +++ b/src/cs50/flask.py @@ -6,10 +6,13 @@ def _wrap_flask(f): if f is None: return - from distutils.version import StrictVersion + from packaging.version import Version, InvalidVersion from .cs50 import _formatException - if f.__version__ < StrictVersion("1.0"): + try: + if Version(f.__version__) < Version("1.0"): + return + except InvalidVersion: return if os.getenv("CS50_IDE_TYPE") == "online":