From 7c6a926648025d5251cee6eb06f27b539483dd3c Mon Sep 17 00:00:00 2001 From: Grant Lanham Jr Date: Tue, 4 Apr 2023 15:27:33 -0400 Subject: [PATCH] Use packaging instead of distutils (#3472) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Noémi Ványi --- searx_extra/update/update_firefox_version.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/searx_extra/update/update_firefox_version.py b/searx_extra/update/update_firefox_version.py index 6acfe76c..8349e5b0 100755 --- a/searx_extra/update/update_firefox_version.py +++ b/searx_extra/update/update_firefox_version.py @@ -5,7 +5,7 @@ import requests import re from os.path import dirname, join from urllib.parse import urlparse, urljoin -from distutils.version import LooseVersion, StrictVersion +from packaging.version import Version, parse from lxml import html from searx import searx_dir @@ -39,7 +39,7 @@ def fetch_firefox_versions(): if path.startswith(RELEASE_PATH): version = path[len(RELEASE_PATH):-1] if NORMAL_REGEX.match(version): - versions.append(LooseVersion(version)) + versions.append(Version(version)) list.sort(versions, reverse=True) return versions @@ -49,12 +49,12 @@ def fetch_firefox_last_versions(): versions = fetch_firefox_versions() result = [] - major_last = versions[0].version[0] + major_last = versions[0].major major_list = (major_last, major_last - 1) for version in versions: - major_current = version.version[0] + major_current = version.major if major_current in major_list: - result.append(version.vstring) + result.append(str(version)) return result