lasers/searx
1
0
Fork 0
mirror of https://github.com/searx/searx synced 2024-11-27 20:40:15 +01:00
Code Issues Projects Releases Wiki Activity

Use packaging instead of distutils (#3472)

Browse Source 
Co-authored-by: Noémi Ványi <kvch@users.noreply.github.com>
This commit is contained in:
Grant Lanham Jr 2023-04-04 15:27:33 -04:00 committed by GitHub
parent 38606234a8
commit 7c6a926648
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
searx_extra/update/update_firefox_version.py
View File

@ -5,7 +5,7 @@ import requests
import re import re
from os.path import dirname, join from os.path import dirname, join
from urllib.parse import urlparse, urljoin from urllib.parse import urlparse, urljoin
from distutils.version import LooseVersion, StrictVersion from packaging.version import Version, parse
from lxml import html from lxml import html
from searx import searx_dir from searx import searx_dir
@ -39,7 +39,7 @@ def fetch_firefox_versions():
if path.startswith(RELEASE_PATH): if path.startswith(RELEASE_PATH):
version = path[len(RELEASE_PATH):-1] version = path[len(RELEASE_PATH):-1]
if NORMAL_REGEX.match(version): if NORMAL_REGEX.match(version):
versions.append(LooseVersion(version)) versions.append(Version(version))
list.sort(versions, reverse=True) list.sort(versions, reverse=True)
return versions return versions
@ -49,12 +49,12 @@ def fetch_firefox_last_versions():
versions = fetch_firefox_versions() versions = fetch_firefox_versions()
result = [] result = []
major_last = versions[0].version[0] major_last = versions[0].major
major_list = (major_last, major_last - 1) major_list = (major_last, major_last - 1)
for version in versions: for version in versions:
major_current = version.version[0] major_current = version.major
if major_current in major_list: if major_current in major_list:
result.append(version.vstring) result.append(str(version))
return result return result