diff --git a/src/yunohost/domain.py b/src/yunohost/domain.py
index 5d47aefe0..5761474a6 100644
--- a/src/yunohost/domain.py
+++ b/src/yunohost/domain.py
@@ -62,18 +62,15 @@ def domain_list(exclude_subdomains=False):
 
         result_list.append(domain)
 
-    def cmp_domain(domain1, domain2):
+    def cmp_domain(domain):
         # Keep the main part of the domain and the extension together
         # eg: this.is.an.example.com -> ['example.com', 'an', 'is', 'this']
-        domain1 = domain1.split('.')
-        domain2 = domain2.split('.')
-        domain1[-1] = domain1[-2] + domain1.pop()
-        domain2[-1] = domain2[-2] + domain2.pop()
-        domain1 = list(reversed(domain1))
-        domain2 = list(reversed(domain2))
-        return cmp(domain1, domain2)
+        domain = domain.split('.')
+        domain[-1] = domain[-2] + domain.pop()
+        domain = list(reversed(domain))
+        return domain
 
-    result_list = sorted(result_list, cmp_domain)
+    result_list = sorted(result_list, key=cmp_domain)
 
     return {
         'domains': result_list,
diff --git a/src/yunohost/utils/packages.py b/src/yunohost/utils/packages.py
index f9ad385f8..5672a7233 100644
--- a/src/yunohost/utils/packages.py
+++ b/src/yunohost/utils/packages.py
@@ -70,7 +70,11 @@ def meets_version_specifier(pkg_name, specifier):
     op, req_version = re.search(r'(<<|<=|=|>=|>>) *([\d\.]+)', specifier).groups()
     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 = {
         "<<": lambda v1, v2: cmp(v1, v2) in [-1],
         "<=": lambda v1, v2: cmp(v1, v2) in [-1, 0],