YunoHost/yunohost
1
0
Fork 0
mirror of https://github.com/YunoHost/yunohost.git synced 2024-09-03 20:06:10 +02:00
Code Issues Projects Releases Packages Wiki Activity

cmp() doesn't exists anymore

Browse source
This commit is contained in:
Alexandre Aubin 2021-01-01 04:07:27 +01:00
parent 0335bcbf4c
commit 0434bd5dc2
2 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/yunohost/domain.py
View file

@ -62,18 +62,15 @@ def domain_list(exclude_subdomains=False):
result_list.append(domain) result_list.append(domain)
def cmp_domain(domain1, domain2): def cmp_domain(domain):
# Keep the main part of the domain and the extension together # Keep the main part of the domain and the extension together
# eg: this.is.an.example.com -> ['example.com', 'an', 'is', 'this'] # eg: this.is.an.example.com -> ['example.com', 'an', 'is', 'this']
domain1 = domain1.split('.') domain = domain.split('.')
domain2 = domain2.split('.') domain[-1] = domain[-2] + domain.pop()
domain1[-1] = domain1[-2] + domain1.pop() domain = list(reversed(domain))
domain2[-1] = domain2[-2] + domain2.pop() return domain
domain1 = list(reversed(domain1))
domain2 = list(reversed(domain2))
return cmp(domain1, domain2)
result_list = sorted(result_list, cmp_domain) result_list = sorted(result_list, key=cmp_domain)
return { return {
'domains': result_list, 'domains': result_list,

6
src/yunohost/utils/packages.py
View file

@ -70,7 +70,11 @@ def meets_version_specifier(pkg_name, specifier):
op, req_version = re.search(r'(<<|<=|=|>=|>>) *([\d\.]+)', specifier).groups() op, req_version = re.search(r'(<<|<=|=|>=|>>) *([\d\.]+)', specifier).groups()
req_version = version.parse(req_version) req_version = version.parse(req_version)
# cmp is a python builtin that returns (-1, 0, 1) depending on comparison # Python2 had a builtin that returns (-1, 0, 1) depending on comparison
# c.f. https://stackoverflow.com/a/22490617
def cmp(a, b):
return (a > b) - (a < b)
deb_operators = { deb_operators = {
"<<": lambda v1, v2: cmp(v1, v2) in [-1], "<<": lambda v1, v2: cmp(v1, v2) in [-1],
"<=": lambda v1, v2: cmp(v1, v2) in [-1, 0], "<=": lambda v1, v2: cmp(v1, v2) in [-1, 0],