From 8e30768598bf866424529ca61b1c77ca2b756d17 Mon Sep 17 00:00:00 2001
From: Alexandre Aubin <alex.aubin@mailoo.org>
Date: Wed, 30 Dec 2020 21:53:43 +0100
Subject: [PATCH 01/22] 2to3-2.7
 ./src/yunohost/{,data_migrations/,utils/,tests/}*.py
 data/hooks/diagnosis/*.py -w -x dict -x print --nobackups --no-diffs

---
 src/yunohost/app.py                           | 29 +++++++++----------
 src/yunohost/backup.py                        |  2 +-
 src/yunohost/certificate.py                   |  2 +-
 src/yunohost/dyndns.py                        |  2 +-
 src/yunohost/log.py                           |  7 ++---
 src/yunohost/settings.py                      |  4 +--
 src/yunohost/tests/test_apps.py               |  2 +-
 .../tests/test_apps_arguments_parsing.py      |  2 +-
 src/yunohost/tests/test_appurl.py             |  2 +-
 src/yunohost/tests/test_backuprestore.py      |  2 +-
 src/yunohost/tests/test_changeurl.py          |  2 +-
 src/yunohost/tests/test_permission.py         |  2 +-
 src/yunohost/tests/test_regenconf.py          |  2 +-
 src/yunohost/tests/test_service.py            |  2 +-
 src/yunohost/tests/test_user-group.py         |  2 +-
 src/yunohost/tools.py                         |  6 ++--
 16 files changed, 33 insertions(+), 37 deletions(-)

diff --git a/src/yunohost/app.py b/src/yunohost/app.py
index d32fb59a2..05580fbe1 100644
--- a/src/yunohost/app.py
+++ b/src/yunohost/app.py
@@ -30,10 +30,10 @@ import shutil
 import yaml
 import time
 import re
-import urlparse
+import urllib.parse
 import subprocess
 import glob
-import urllib
+import urllib.request, urllib.parse, urllib.error
 from collections import OrderedDict
 
 from moulinette import msignals, m18n, msettings
@@ -736,7 +736,7 @@ def app_install(operation_logger, app, label=None, args=None, no_remove_on_failu
 
     # Retrieve arguments list for install script
     args_dict = {} if not args else \
-        dict(urlparse.parse_qsl(args, keep_blank_values=True))
+        dict(urllib.parse.parse_qsl(args, keep_blank_values=True))
     args_odict = _parse_args_from_manifest(manifest, 'install', args=args_dict)
 
     # Validate domain / path availability for webapps
@@ -759,7 +759,7 @@ def app_install(operation_logger, app, label=None, args=None, no_remove_on_failu
     # Also redact the % escaped version of the password that might appear in
     # the 'args' section of metadata (relevant for password with non-alphanumeric char)
     data_to_redact = [value[0] for value in args_odict.values() if value[1] == "password"]
-    data_to_redact += [urllib.quote(data) for data in data_to_redact if urllib.quote(data) != data]
+    data_to_redact += [urllib.parse.quote(data) for data in data_to_redact if urllib.parse.quote(data) != data]
     operation_logger.data_to_redact.extend(data_to_redact)
 
     operation_logger.related_to = [s for s in operation_logger.related_to if s[0] != "app"]
@@ -1406,7 +1406,7 @@ def app_ssowatconf():
 
     write_to_json('/etc/ssowat/conf.json', conf_dict, sort_keys=True, indent=4)
 
-    from utils.legacy import translate_legacy_rules_in_ssowant_conf_json_persistent
+    from .utils.legacy import translate_legacy_rules_in_ssowant_conf_json_persistent
     translate_legacy_rules_in_ssowant_conf_json_persistent()
 
     logger.debug(m18n.n('ssowat_conf_generated'))
@@ -1456,7 +1456,7 @@ def app_action_run(operation_logger, app, action, args=None):
     action_declaration = actions[action]
 
     # Retrieve arguments list for install script
-    args_dict = dict(urlparse.parse_qsl(args, keep_blank_values=True)) if args else {}
+    args_dict = dict(urllib.parse.parse_qsl(args, keep_blank_values=True)) if args else {}
     args_odict = _parse_args_for_action(actions[action], args=args_dict)
     args_list = [value[0] for value in args_odict.values()]
 
@@ -1598,7 +1598,7 @@ def app_config_apply(operation_logger, app, args):
         "YNH_APP_INSTANCE_NAME": app,
         "YNH_APP_INSTANCE_NUMBER": str(app_instance_nb),
     }
-    args = dict(urlparse.parse_qsl(args, keep_blank_values=True)) if args else {}
+    args = dict(urllib.parse.parse_qsl(args, keep_blank_values=True)) if args else {}
 
     for tab in config_panel.get("panel", []):
         tab_id = tab["id"]  # this makes things easier to debug on crash
@@ -1817,8 +1817,7 @@ def _get_app_config_panel(app_id):
             "panel": [],
         }
 
-        panels = filter(lambda key_value: key_value[0] not in ("name", "version") and isinstance(key_value[1], OrderedDict),
-                        toml_config_panel.items())
+        panels = [key_value for key_value in toml_config_panel.items() if key_value[0] not in ("name", "version") and isinstance(key_value[1], OrderedDict)]
 
         for key, value in panels:
             panel = {
@@ -1827,8 +1826,7 @@ def _get_app_config_panel(app_id):
                 "sections": [],
             }
 
-            sections = filter(lambda k_v1: k_v1[0] not in ("name",) and isinstance(k_v1[1], OrderedDict),
-                              value.items())
+            sections = [k_v1 for k_v1 in value.items() if k_v1[0] not in ("name",) and isinstance(k_v1[1], OrderedDict)]
 
             for section_key, section_value in sections:
                 section = {
@@ -1837,8 +1835,7 @@ def _get_app_config_panel(app_id):
                     "options": [],
                 }
 
-                options = filter(lambda k_v: k_v[0] not in ("name",) and isinstance(k_v[1], OrderedDict),
-                                 section_value.items())
+                options = [k_v for k_v in section_value.items() if k_v[0] not in ("name",) and isinstance(k_v[1], OrderedDict)]
 
                 for option_key, option_value in options:
                     option = dict(option_value)
@@ -2315,7 +2312,7 @@ def _encode_string(value):
     """
     Return the string encoded in utf-8 if needed
     """
-    if isinstance(value, unicode):
+    if isinstance(value, str):
         return value.encode('utf8')
     return value
 
@@ -2926,7 +2923,7 @@ def _load_apps_catalog():
         try:
             apps_catalog_content = read_json(cache_file) if os.path.exists(cache_file) else None
         except Exception as e:
-            raise ("Unable to read cache for apps_catalog %s : %s" % (apps_catalog_id, str(e)))
+            raise "Unable to read cache for apps_catalog %s : %s"
 
         # Check that the version of the data matches version ....
         # ... otherwise it means we updated yunohost in the meantime
@@ -2976,7 +2973,7 @@ def is_true(arg):
     """
     if isinstance(arg, bool):
         return arg
-    elif isinstance(arg, basestring):
+    elif isinstance(arg, str):
         return arg.lower() in ['yes', 'true', 'on']
     else:
         logger.debug('arg should be a boolean or a string, got %r', arg)
diff --git a/src/yunohost/backup.py b/src/yunohost/backup.py
index c0f11eae8..7c75837b0 100644
--- a/src/yunohost/backup.py
+++ b/src/yunohost/backup.py
@@ -882,7 +882,7 @@ class RestoreManager():
         End a restore operations by cleaning the working directory and
         regenerate ssowat conf (if some apps were restored)
         """
-        from permission import permission_sync_to_user
+        from .permission import permission_sync_to_user
 
         permission_sync_to_user()
 
diff --git a/src/yunohost/certificate.py b/src/yunohost/certificate.py
index c9451c2be..fc81ae0a6 100644
--- a/src/yunohost/certificate.py
+++ b/src/yunohost/certificate.py
@@ -385,7 +385,7 @@ def certificate_renew(domain_list, force=False, no_checks=False, email=False, st
             _fetch_and_enable_new_certificate(domain, staging, no_checks=no_checks)
         except Exception as e:
             import traceback
-            from StringIO import StringIO
+            from io import StringIO
             stack = StringIO()
             traceback.print_exc(file=stack)
             msg = "Certificate renewing for %s failed !" % (domain)
diff --git a/src/yunohost/dyndns.py b/src/yunohost/dyndns.py
index fe2a1bc9b..e43c180ad 100644
--- a/src/yunohost/dyndns.py
+++ b/src/yunohost/dyndns.py
@@ -105,7 +105,7 @@ def _dyndns_available(provider, domain):
         raise YunohostError('dyndns_could_not_check_available',
                             domain=domain, provider=provider)
 
-    return r == u"Domain %s is available" % domain
+    return r == "Domain %s is available" % domain
 
 
 @is_unit_operation()
diff --git a/src/yunohost/log.py b/src/yunohost/log.py
index cf108b989..a21ddd606 100644
--- a/src/yunohost/log.py
+++ b/src/yunohost/log.py
@@ -65,8 +65,7 @@ def log_list(limit=None, with_details=False, with_suboperations=False):
 
     operations = {}
 
-    logs = filter(lambda x: x.endswith(METADATA_FILE_EXT),
-                  os.listdir(OPERATIONS_PATH))
+    logs = [x for x in os.listdir(OPERATIONS_PATH) if x.endswith(METADATA_FILE_EXT)]
     logs = list(reversed(sorted(logs)))
 
     if limit is not None:
@@ -337,7 +336,7 @@ def is_unit_operation(entities=['app', 'domain', 'group', 'service', 'user'],
                     entity_type = entity
 
                 if entity in kwargs and kwargs[entity] is not None:
-                    if isinstance(kwargs[entity], basestring):
+                    if isinstance(kwargs[entity], str):
                         related_to.append((entity_type, kwargs[entity]))
                     else:
                         for x in kwargs[entity]:
@@ -596,7 +595,7 @@ class OperationLogger(object):
         """
         if self.ended_at is not None or self.started_at is None:
             return
-        if error is not None and not isinstance(error, basestring):
+        if error is not None and not isinstance(error, str):
             error = str(error)
         self.ended_at = datetime.utcnow()
         self._error = error
diff --git a/src/yunohost/settings.py b/src/yunohost/settings.py
index 3c79d7945..060aca6e4 100644
--- a/src/yunohost/settings.py
+++ b/src/yunohost/settings.py
@@ -29,7 +29,7 @@ def is_boolean(value):
     """
     if isinstance(value, bool):
         return True, value
-    elif isinstance(value, basestring):
+    elif isinstance(value, str):
         if str(value).lower() in ['true', 'on', 'yes', 'false', 'off', 'no']:
             return True, str(value).lower() in ['true', 'on', 'yes']
         else:
@@ -141,7 +141,7 @@ def settings_set(key, value):
                 raise YunohostError('global_settings_bad_type_for_setting', setting=key,
                                     received_type=type(value).__name__, expected_type=key_type)
     elif key_type == "string":
-        if not isinstance(value, basestring):
+        if not isinstance(value, str):
             raise YunohostError('global_settings_bad_type_for_setting', setting=key,
                                 received_type=type(value).__name__, expected_type=key_type)
     elif key_type == "enum":
diff --git a/src/yunohost/tests/test_apps.py b/src/yunohost/tests/test_apps.py
index 0f4c3749a..baa3d5181 100644
--- a/src/yunohost/tests/test_apps.py
+++ b/src/yunohost/tests/test_apps.py
@@ -4,7 +4,7 @@ import pytest
 import shutil
 import requests
 
-from conftest import message, raiseYunohostError, get_test_apps_dir
+from .conftest import message, raiseYunohostError, get_test_apps_dir
 
 from moulinette.utils.filesystem import mkdir
 
diff --git a/src/yunohost/tests/test_apps_arguments_parsing.py b/src/yunohost/tests/test_apps_arguments_parsing.py
index 88c235252..dfe17d229 100644
--- a/src/yunohost/tests/test_apps_arguments_parsing.py
+++ b/src/yunohost/tests/test_apps_arguments_parsing.py
@@ -2,7 +2,7 @@ import sys
 import pytest
 
 from mock import patch
-from StringIO import StringIO
+from io import StringIO
 from collections import OrderedDict
 
 from moulinette import msignals
diff --git a/src/yunohost/tests/test_appurl.py b/src/yunohost/tests/test_appurl.py
index 11ee7b4f5..3a2313b0e 100644
--- a/src/yunohost/tests/test_appurl.py
+++ b/src/yunohost/tests/test_appurl.py
@@ -1,7 +1,7 @@
 import pytest
 import os
 
-from conftest import get_test_apps_dir
+from .conftest import get_test_apps_dir
 
 from yunohost.utils.error import YunohostError
 from yunohost.app import app_install, app_remove, _normalize_domain_path
diff --git a/src/yunohost/tests/test_backuprestore.py b/src/yunohost/tests/test_backuprestore.py
index 9c9448879..b88fbd5b3 100644
--- a/src/yunohost/tests/test_backuprestore.py
+++ b/src/yunohost/tests/test_backuprestore.py
@@ -3,7 +3,7 @@ import os
 import shutil
 import subprocess
 
-from conftest import message, raiseYunohostError, get_test_apps_dir
+from .conftest import message, raiseYunohostError, get_test_apps_dir
 
 from yunohost.app import app_install, app_remove, app_ssowatconf
 from yunohost.app import _is_installed
diff --git a/src/yunohost/tests/test_changeurl.py b/src/yunohost/tests/test_changeurl.py
index ecd926a2e..ef076e67b 100644
--- a/src/yunohost/tests/test_changeurl.py
+++ b/src/yunohost/tests/test_changeurl.py
@@ -3,7 +3,7 @@ import time
 import requests
 import os
 
-from conftest import get_test_apps_dir
+from .conftest import get_test_apps_dir
 
 from yunohost.app import app_install, app_change_url, app_remove, app_map
 from yunohost.domain import _get_maindomain
diff --git a/src/yunohost/tests/test_permission.py b/src/yunohost/tests/test_permission.py
index 1d3961585..a1f411b80 100644
--- a/src/yunohost/tests/test_permission.py
+++ b/src/yunohost/tests/test_permission.py
@@ -6,7 +6,7 @@ import os
 import json
 import shutil
 
-from conftest import message, raiseYunohostError, get_test_apps_dir
+from .conftest import message, raiseYunohostError, get_test_apps_dir
 
 from yunohost.app import app_install, app_upgrade, app_remove, app_change_url, app_map, _installed_apps, APPS_SETTING_PATH, _set_app_settings, _get_app_settings
 from yunohost.user import user_list, user_create, user_delete, \
diff --git a/src/yunohost/tests/test_regenconf.py b/src/yunohost/tests/test_regenconf.py
index 4e1ae679b..c9a3e68f5 100644
--- a/src/yunohost/tests/test_regenconf.py
+++ b/src/yunohost/tests/test_regenconf.py
@@ -1,6 +1,6 @@
 import os
 
-from conftest import message
+from .conftest import message
 from yunohost.domain import domain_add, domain_remove, domain_list
 from yunohost.regenconf import regen_conf, manually_modified_files, _get_conf_hashes, _force_clear_hashes
 
diff --git a/src/yunohost/tests/test_service.py b/src/yunohost/tests/test_service.py
index d0a3d4fc2..0c65a864a 100644
--- a/src/yunohost/tests/test_service.py
+++ b/src/yunohost/tests/test_service.py
@@ -1,6 +1,6 @@
 import os
 
-from conftest import raiseYunohostError
+from .conftest import raiseYunohostError
 
 from yunohost.service import _get_services, _save_services, service_status, service_add, service_remove, service_log
 
diff --git a/src/yunohost/tests/test_user-group.py b/src/yunohost/tests/test_user-group.py
index c0f51e35a..31131e939 100644
--- a/src/yunohost/tests/test_user-group.py
+++ b/src/yunohost/tests/test_user-group.py
@@ -1,6 +1,6 @@
 import pytest
 
-from conftest import message, raiseYunohostError
+from .conftest import message, raiseYunohostError
 
 from yunohost.user import user_list, user_info, user_create, user_delete, user_update, \
     user_group_list, user_group_create, user_group_delete, user_group_update
diff --git a/src/yunohost/tools.py b/src/yunohost/tools.py
index 96bd01ed6..f01f6adb8 100644
--- a/src/yunohost/tools.py
+++ b/src/yunohost/tools.py
@@ -303,7 +303,7 @@ def tools_postinstall(operation_logger, domain, password, ignore_dyndns=False,
         '/home/yunohost.app'
     ]
 
-    for folder in filter(lambda x: not os.path.exists(x), folders_to_create):
+    for folder in [x for x in folders_to_create if not os.path.exists(x)]:
         os.makedirs(folder)
 
     # Change folders permissions
@@ -953,7 +953,7 @@ def _get_migrations_list():
     # (in particular, pending migrations / not already ran are not listed
     states = tools_migrations_state()["migrations"]
 
-    for migration_file in filter(lambda x: re.match(r"^\d+_[a-zA-Z0-9_]+\.py$", x), os.listdir(migrations_path)):
+    for migration_file in [x for x in os.listdir(migrations_path) if re.match(r"^\d+_[a-zA-Z0-9_]+\.py$", x)]:
         m = _load_migration(migration_file)
         m.state = states.get(m.id, "pending")
         migrations.append(m)
@@ -972,7 +972,7 @@ def _get_migration_by_name(migration_name):
         raise AssertionError("Unable to find migration with name %s" % migration_name)
 
     migrations_path = data_migrations.__path__[0]
-    migrations_found = filter(lambda x: re.match(r"^\d+_%s\.py$" % migration_name, x), os.listdir(migrations_path))
+    migrations_found = [x for x in os.listdir(migrations_path) if re.match(r"^\d+_%s\.py$" % migration_name, x)]
 
     assert len(migrations_found) == 1, "Unable to find migration with name %s" % migration_name
 

From 177957138c9f4114d118046ccf32bdcd6a84e360 Mon Sep 17 00:00:00 2001
From: Alexandre Aubin <alex.aubin@mailoo.org>
Date: Wed, 30 Dec 2020 21:59:30 +0100
Subject: [PATCH 02/22] Naively updating debian/control to python3

---
 debian/control | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/debian/control b/debian/control
index bfea80ccd..3d7dc41b9 100644
--- a/debian/control
+++ b/debian/control
@@ -2,19 +2,19 @@ Source: yunohost
 Section: utils
 Priority: extra
 Maintainer: YunoHost Contributors <contrib@yunohost.org>
-Build-Depends: debhelper (>=9), dh-systemd, dh-python, python-all (>= 2.7), python-yaml, python-jinja2
+Build-Depends: debhelper (>=9), dh-systemd, dh-python, python3-all (>= 3.7), python3-yaml, python3-jinja2
 Standards-Version: 3.9.6
-X-Python-Version: >= 2.7
+X-Python-Version: >= 3.7
 Homepage: https://yunohost.org/
 
 Package: yunohost
 Essential: yes
 Architecture: all
-Depends: ${python:Depends}, ${misc:Depends}
+Depends: ${python3:Depends}, ${misc:Depends}
  , moulinette (>= 4.1.0.1), ssowat (>= 4.0)
- , python-psutil, python-requests, python-dnspython, python-openssl
- , python-miniupnpc, python-dbus, python-jinja2
- , python-toml, python-packaging, python-publicsuffix
+ , python3-psutil, python3-requests, python3-dnspython, python3-openssl
+ , python3-miniupnpc, python3-dbus, python3-jinja2
+ , python3-toml, python3-packaging, python3-publicsuffix
  , apt, apt-transport-https, apt-utils, dirmngr
  , php7.3-common, php7.3-fpm, php7.3-ldap, php7.3-intl
  , mariadb-server, php7.3-mysql
@@ -33,7 +33,7 @@ Recommends: yunohost-admin
  , ntp, inetutils-ping | iputils-ping
  , bash-completion, rsyslog
  , php7.3-gd, php7.3-curl, php-gettext
- , python-pip
+ , python3-pip
  , unattended-upgrades
  , libdbd-ldap-perl, libnet-dns-perl
 Suggests: htop, vim, rsync, acpi-support-base, udisks2

From 6b1fed53d6d327405aba88a8925840ea43670bbd Mon Sep 17 00:00:00 2001
From: Alexandre Aubin <alex.aubin@mailoo.org>
Date: Wed, 30 Dec 2020 22:00:06 +0100
Subject: [PATCH 03/22] Update tox.ini to python3 only

---
 tox.ini | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tox.ini b/tox.ini
index 6c1139d52..36134e85a 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,12 +1,12 @@
 [tox]
-envlist = py{27,37}-{lint,invalidcode},py37-black
+envlist = py37-{lint,invalidcode},py37-black
 
 [testenv]
 skip_install=True
 deps =
-  py{27,37}-{lint,invalidcode}: flake8
+  py37-{lint,invalidcode}: flake8
   py37-black: black
 commands =
-        py{27,37}-lint: flake8 src doc data tests --ignore E402,E501 --exclude src/yunohost/vendor
-        py{27,37}-invalidcode: flake8 src data --exclude src/yunohost/tests,src/yunohost/vendor --select F
+        py37-lint: flake8 src doc data tests --ignore E402,E501 --exclude src/yunohost/vendor
+        py37-invalidcode: flake8 src data --exclude src/yunohost/tests,src/yunohost/vendor --select F
         py37-black: black --check --diff src doc data tests

From 299e04cfc71cb8141a4117456de4b505f8097dfb Mon Sep 17 00:00:00 2001
From: Alexandre Aubin <alex.aubin@mailoo.org>
Date: Wed, 30 Dec 2020 22:29:16 +0100
Subject: [PATCH 04/22] Set yunohost(-api) bins to python3

---
 bin/yunohost     | 2 +-
 bin/yunohost-api | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/yunohost b/bin/yunohost
index 546d2d913..0220c5f09 100755
--- a/bin/yunohost
+++ b/bin/yunohost
@@ -1,4 +1,4 @@
-#! /usr/bin/python
+#! /usr/bin/python3
 # -*- coding: utf-8 -*-
 
 import os
diff --git a/bin/yunohost-api b/bin/yunohost-api
index cc849590a..b3ed3a817 100755
--- a/bin/yunohost-api
+++ b/bin/yunohost-api
@@ -1,4 +1,4 @@
-#! /usr/bin/python
+#! /usr/bin/python3
 # -*- coding: utf-8 -*-
 
 import sys

From 86a612fab1fa76f14a3dafed8ceb9360386ea0fc Mon Sep 17 00:00:00 2001
From: Alexandre Aubin <alex.aubin@mailoo.org>
Date: Fri, 1 Jan 2021 04:04:56 +0100
Subject: [PATCH 05/22] c.f. change in the moulinette regarding
 call_async_output and the handling of stdinfo ... YNH_STDINFO is now a file
 descriptor instead of a named pipe

---
 data/helpers.d/logging | 2 +-
 src/yunohost/hook.py   | 8 +-------
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/data/helpers.d/logging b/data/helpers.d/logging
index 45b5b7e67..dc32ecba9 100644
--- a/data/helpers.d/logging
+++ b/data/helpers.d/logging
@@ -35,7 +35,7 @@ ynh_print_info() {
     # Manage arguments with getopts
     ynh_handle_getopts_args "$@"
 
-    echo "$message" >> "$YNH_STDINFO"
+    echo "$message" >&$YNH_STDINFO
 }
 
 # Ignore the yunohost-cli log to prevent errors with conditional commands
diff --git a/src/yunohost/hook.py b/src/yunohost/hook.py
index eafcaf825..94126fd36 100644
--- a/src/yunohost/hook.py
+++ b/src/yunohost/hook.py
@@ -387,9 +387,6 @@ def _hook_exec_bash(path, args, no_trace, chdir, env, user, return_format, logge
 
     env['YNH_INTERFACE'] = msettings.get('interface')
 
-    stdinfo = os.path.join(tempfile.mkdtemp(), "stdinfo")
-    env['YNH_STDINFO'] = stdinfo
-
     stdreturn = os.path.join(tempfile.mkdtemp(), "stdreturn")
     with open(stdreturn, 'w') as f:
         f.write('')
@@ -415,10 +412,7 @@ def _hook_exec_bash(path, args, no_trace, chdir, env, user, return_format, logge
 
     logger.debug("Executing command '%s'" % ' '.join(command))
 
-    returncode = call_async_output(
-        command, loggers, shell=False, cwd=chdir,
-        stdinfo=stdinfo
-    )
+    returncode = call_async_output(command, loggers, shell=False, cwd=chdir)
 
     raw_content = None
     try:

From 5f0b1b745069b89d7474386de1f21326137dfabf Mon Sep 17 00:00:00 2001
From: Alexandre Aubin <alex.aubin@mailoo.org>
Date: Fri, 1 Jan 2021 04:06:09 +0100
Subject: [PATCH 06/22] Encoding fixes

---
 src/yunohost/app.py            | 15 +++------------
 src/yunohost/service.py        |  2 +-
 src/yunohost/utils/password.py |  2 +-
 3 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/src/yunohost/app.py b/src/yunohost/app.py
index 05580fbe1..d3cf5a11c 100644
--- a/src/yunohost/app.py
+++ b/src/yunohost/app.py
@@ -1873,7 +1873,7 @@ def _get_app_settings(app_id):
             settings = yaml.load(f)
         # If label contains unicode char, this may later trigger issues when building strings...
         # FIXME: this should be propagated to read_yaml so that this fix applies everywhere I think...
-        settings = {k: _encode_string(v) for k, v in settings.items()}
+        settings = {k: v for k, v in settings.items()}
         if app_id == settings['id']:
             return settings
     except (IOError, TypeError, KeyError):
@@ -2300,21 +2300,12 @@ def _value_for_locale(values):
 
     for lang in [m18n.locale, m18n.default_locale]:
         try:
-            return _encode_string(values[lang])
+            return values[lang]
         except KeyError:
             continue
 
     # Fallback to first value
-    return _encode_string(values.values()[0])
-
-
-def _encode_string(value):
-    """
-    Return the string encoded in utf-8 if needed
-    """
-    if isinstance(value, str):
-        return value.encode('utf8')
-    return value
+    return values.values()[0]
 
 
 def _check_manifest_requirements(manifest, app_instance_name):
diff --git a/src/yunohost/service.py b/src/yunohost/service.py
index 1b1fec81b..89d51b740 100644
--- a/src/yunohost/service.py
+++ b/src/yunohost/service.py
@@ -358,7 +358,7 @@ def _get_and_format_service_status(service, infos):
         # that mean that we don't have a translation for this string
         # that's the only way to test for that for now
         # if we don't have it, uses the one provided by systemd
-        if description.decode('utf-8') == translation_key:
+        if description == translation_key:
             description = str(raw_status.get("Description", ""))
 
     output = {
diff --git a/src/yunohost/utils/password.py b/src/yunohost/utils/password.py
index e7ff6c275..ac26ae4bf 100644
--- a/src/yunohost/utils/password.py
+++ b/src/yunohost/utils/password.py
@@ -173,7 +173,7 @@ class PasswordValidator(object):
         # stdin to avoid it being shown in ps -ef --forest...
         command = "grep -q -f - %s" % MOST_USED_PASSWORDS
         p = subprocess.Popen(command.split(), stdin=subprocess.PIPE)
-        p.communicate(input=password)
+        p.communicate(input=password.encode('utf-8'))
         return not bool(p.returncode)
 
 

From 0335bcbf4c0ddbc9f744451a646cea962109d276 Mon Sep 17 00:00:00 2001
From: Alexandre Aubin <alex.aubin@mailoo.org>
Date: Fri, 1 Jan 2021 04:07:16 +0100
Subject: [PATCH 07/22] .keys() now returns a generator, gotta wrap it in a
 list() for what we do here

---
 src/yunohost/user.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/yunohost/user.py b/src/yunohost/user.py
index 67fd43a03..63a5e7d28 100644
--- a/src/yunohost/user.py
+++ b/src/yunohost/user.py
@@ -540,7 +540,7 @@ def user_group_list(short=False, full=False, include_primary_groups=True):
             groups[name]["permissions"] = [_ldap_path_extract(p, "cn") for p in infos.get("permission", [])]
 
     if short:
-        groups = groups.keys()
+        groups = list(groups.keys())
 
     return {'groups': groups}
 
@@ -625,7 +625,7 @@ def user_group_delete(operation_logger, groupname, force=False, sync_perm=True):
     from yunohost.permission import permission_sync_to_user
     from yunohost.utils.ldap import _get_ldap_interface
 
-    existing_groups = user_group_list()['groups'].keys()
+    existing_groups = list(user_group_list()['groups'].keys())
     if groupname not in existing_groups:
         raise YunohostError('group_unknown', group=groupname)
 
@@ -633,7 +633,7 @@ def user_group_delete(operation_logger, groupname, force=False, sync_perm=True):
     # without the force option...
     #
     # We also can't delete "all_users" because that's a special group...
-    existing_users = user_list()['users'].keys()
+    existing_users = list(user_list()['users'].keys())
     undeletable_groups = existing_users + ["all_users", "visitors"]
     if groupname in undeletable_groups and not force:
         raise YunohostError('group_cannot_be_deleted', group=groupname)
@@ -669,7 +669,7 @@ def user_group_update(operation_logger, groupname, add=None, remove=None, force=
     from yunohost.permission import permission_sync_to_user
     from yunohost.utils.ldap import _get_ldap_interface
 
-    existing_users = user_list()['users'].keys()
+    existing_users = list(user_list()['users'].keys())
 
     # Refuse to edit a primary group of a user (e.g. group 'sam' related to user 'sam')
     # Those kind of group should only ever contain the user (e.g. sam) and only this one.

From 0434bd5dc22015a06b2756b155768f9f23103c99 Mon Sep 17 00:00:00 2001
From: Alexandre Aubin <alex.aubin@mailoo.org>
Date: Fri, 1 Jan 2021 04:07:27 +0100
Subject: [PATCH 08/22] cmp() doesn't exists anymore

---
 src/yunohost/domain.py         | 15 ++++++---------
 src/yunohost/utils/packages.py |  6 +++++-
 2 files changed, 11 insertions(+), 10 deletions(-)

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],

From cce020daac089abbbf6a8101cfb9f5ce8ad80f2f Mon Sep 17 00:00:00 2001
From: Alexandre Aubin <alex.aubin@mailoo.org>
Date: Fri, 1 Jan 2021 05:03:55 +0100
Subject: [PATCH 09/22] Uniformize check_output calls to use moulinette helpers
 which shall now automatically decode() automatically + also strip() etc

---
 data/hooks/diagnosis/00-basesystem.py      |  3 ++-
 data/hooks/diagnosis/50-systemresources.py |  5 +++--
 src/yunohost/app.py                        | 14 +++++---------
 src/yunohost/backup.py                     |  7 ++++---
 src/yunohost/regenconf.py                  | 10 +++++-----
 src/yunohost/service.py                    |  6 +++---
 src/yunohost/user.py                       |  4 ++--
 7 files changed, 24 insertions(+), 25 deletions(-)

diff --git a/data/hooks/diagnosis/00-basesystem.py b/data/hooks/diagnosis/00-basesystem.py
index edfb68beb..ecde668fb 100644
--- a/data/hooks/diagnosis/00-basesystem.py
+++ b/data/hooks/diagnosis/00-basesystem.py
@@ -149,7 +149,8 @@ class BaseSystemDiagnoser(Diagnoser):
             # "missing some kernel info (see -v), accuracy might be reduced"
             # Dunno what to do about that but we probably don't want to harass
             # users with this warning ...
-            output, err = call.communicate()
+            output, _ = call.communicate()
+            output = output.decode()
             assert call.returncode in (0, 2, 3), "Return code: %s" % call.returncode
 
             # If there are multiple lines, sounds like there was some messages
diff --git a/data/hooks/diagnosis/50-systemresources.py b/data/hooks/diagnosis/50-systemresources.py
index f0fac4974..64517f764 100644
--- a/data/hooks/diagnosis/50-systemresources.py
+++ b/data/hooks/diagnosis/50-systemresources.py
@@ -1,10 +1,11 @@
 #!/usr/bin/env python
 import os
 import psutil
-import subprocess
 import datetime
 import re
 
+from moulinette.utils.process import check_output
+
 from yunohost.diagnosis import Diagnoser
 
 
@@ -119,7 +120,7 @@ class SystemResourcesDiagnoser(Diagnoser):
         def analyzed_kern_log():
 
             cmd = 'tail -n 10000 /var/log/kern.log | grep "oom_reaper: reaped process" || true'
-            out = subprocess.check_output(cmd, shell=True).strip()
+            out = check_output(cmd)
             lines = out.split("\n") if out else []
 
             now = datetime.datetime.now()
diff --git a/src/yunohost/app.py b/src/yunohost/app.py
index d3cf5a11c..0b3f40390 100644
--- a/src/yunohost/app.py
+++ b/src/yunohost/app.py
@@ -39,7 +39,7 @@ from collections import OrderedDict
 from moulinette import msignals, m18n, msettings
 from moulinette.utils.log import getActionLogger
 from moulinette.utils.network import download_json
-from moulinette.utils.process import run_commands
+from moulinette.utils.process import run_commands, check_output
 from moulinette.utils.filesystem import read_file, read_json, read_toml, read_yaml, write_to_file, write_to_json, write_to_yaml, chmod, chown, mkdir
 
 from yunohost.service import service_status, _run_service_command
@@ -411,10 +411,7 @@ def app_change_url(operation_logger, app, domain, path):
         # grab nginx errors
         # the "exit 0" is here to avoid check_output to fail because 'nginx -t'
         # will return != 0 since we are in a failed state
-        nginx_errors = subprocess.check_output("nginx -t; exit 0",
-                                               stderr=subprocess.STDOUT,
-                                               shell=True).rstrip()
-
+        nginx_errors = check_output("nginx -t; exit 0")
         raise YunohostError("app_change_url_failed_nginx_reload", nginx_errors=nginx_errors)
 
     logger.success(m18n.n("app_change_url_success",
@@ -2139,10 +2136,9 @@ def _get_git_last_commit_hash(repository, reference='HEAD'):
 
     """
     try:
-        commit = subprocess.check_output(
-            "git ls-remote --exit-code {0} {1} | awk '{{print $1}}'".format(
-                repository, reference),
-            shell=True)
+        cmd = "git ls-remote --exit-code {0} {1} | awk '{{print $1}}'"\
+            .format(repository, reference)
+        commit = check_output(cmd)
     except subprocess.CalledProcessError:
         logger.exception("unable to get last commit from %s", repository)
         raise ValueError("Unable to get last commit with git")
diff --git a/src/yunohost/backup.py b/src/yunohost/backup.py
index 7c75837b0..dfed5cac1 100644
--- a/src/yunohost/backup.py
+++ b/src/yunohost/backup.py
@@ -41,6 +41,7 @@ from moulinette import msignals, m18n, msettings
 from moulinette.utils import filesystem
 from moulinette.utils.log import getActionLogger
 from moulinette.utils.filesystem import read_file, mkdir, write_to_yaml, read_yaml
+from moulinette.utils.process import check_output
 
 from yunohost.app import (
     app_info, _is_installed,
@@ -2386,7 +2387,7 @@ def _recursive_umount(directory):
     Args:
         directory -- a directory path
     """
-    mount_lines = subprocess.check_output("mount").split("\n")
+    mount_lines = check_output("mount").split("\n")
 
     points_to_umount = [line.split(" ")[2]
                         for line in mount_lines
@@ -2412,8 +2413,8 @@ def disk_usage(path):
     # We don't do this in python with os.stat because we don't want
     # to follow symlinks
 
-    du_output = subprocess.check_output(['du', '-sb', path])
-    return int(du_output.split()[0].decode('utf-8'))
+    du_output = check_output(['du', '-sb', path], shell=False)
+    return int(du_output.split()[0])
 
 
 def binary_to_human(n, customary=False):
diff --git a/src/yunohost/regenconf.py b/src/yunohost/regenconf.py
index 6b369fc8c..9423b1b36 100644
--- a/src/yunohost/regenconf.py
+++ b/src/yunohost/regenconf.py
@@ -21,7 +21,6 @@
 
 import os
 import yaml
-import subprocess
 import shutil
 import hashlib
 
@@ -30,6 +29,7 @@ from datetime import datetime
 
 from moulinette import m18n
 from moulinette.utils import log, filesystem
+from moulinette.utils.process import check_output
 
 from yunohost.utils.error import YunohostError
 from yunohost.log import is_unit_operation
@@ -654,10 +654,10 @@ def manually_modified_files():
 def manually_modified_files_compared_to_debian_default(ignore_handled_by_regenconf=False):
 
     # from https://serverfault.com/a/90401
-    files = subprocess.check_output("dpkg-query -W -f='${Conffiles}\n' '*' \
-                                   | awk 'OFS=\"  \"{print $2,$1}' \
-                                   | md5sum -c 2>/dev/null \
-                                   | awk -F': ' '$2 !~ /OK/{print $1}'", shell=True)
+    files = check_output("dpkg-query -W -f='${Conffiles}\n' '*' \
+                        | awk 'OFS=\"  \"{print $2,$1}' \
+                        | md5sum -c 2>/dev/null \
+                        | awk -F': ' '$2 !~ /OK/{print $1}'")
     files = files.strip().split("\n")
 
     if ignore_handled_by_regenconf:
diff --git a/src/yunohost/service.py b/src/yunohost/service.py
index 89d51b740..0b6860e49 100644
--- a/src/yunohost/service.py
+++ b/src/yunohost/service.py
@@ -35,6 +35,7 @@ from datetime import datetime
 
 from moulinette import m18n
 from yunohost.utils.error import YunohostError
+from moulinette.utils.process import check_output
 from moulinette.utils.log import getActionLogger
 from moulinette.utils.filesystem import read_file, append_to_file, write_to_file
 
@@ -563,8 +564,7 @@ def _give_lock(action, service, p):
     while son_PID == 0 and p.poll() is None:
         # Call systemctl to get the PID
         # Output of the command is e.g. ControlPID=1234
-        son_PID = subprocess.check_output(cmd_get_son_PID.split()) \
-                            .strip().split("=")[1]
+        son_PID = check_output(cmd_get_son_PID).split("=")[1]
         son_PID = int(son_PID)
         time.sleep(1)
 
@@ -720,7 +720,7 @@ def _get_journalctl_logs(service, number="all"):
     services = _get_services()
     systemd_service = services.get(service, {}).get("actual_systemd_service", service)
     try:
-        return subprocess.check_output("journalctl --no-hostname --no-pager -u {0} -n{1}".format(systemd_service, number), shell=True)
+        return check_output("journalctl --no-hostname --no-pager -u {0} -n{1}".format(systemd_service, number))
     except:
         import traceback
         return "error while get services logs from journalctl:\n%s" % traceback.format_exc()
diff --git a/src/yunohost/user.py b/src/yunohost/user.py
index 63a5e7d28..02faff041 100644
--- a/src/yunohost/user.py
+++ b/src/yunohost/user.py
@@ -35,6 +35,7 @@ import copy
 
 from moulinette import msignals, msettings, m18n
 from moulinette.utils.log import getActionLogger
+from moulinette.utils.process import check_output
 
 from yunohost.utils.error import YunohostError
 from yunohost.service import service_status
@@ -467,8 +468,7 @@ def user_info(username):
         else:
             try:
                 cmd = 'doveadm -f flow quota get -u %s' % user['uid'][0]
-                cmd_result = subprocess.check_output(cmd, stderr=subprocess.STDOUT,
-                                                     shell=True)
+                cmd_result = check_output(cmd)
             except Exception as e:
                 cmd_result = ""
                 logger.warning("Failed to fetch quota info ... : %s " % str(e))

From d5da3d899ac53650364a1ff9b2c58a6e26632478 Mon Sep 17 00:00:00 2001
From: Alexandre Aubin <alex.aubin@mailoo.org>
Date: Fri, 1 Jan 2021 05:04:33 +0100
Subject: [PATCH 10/22] Ignore the __pycache__ folder in diagnosis hook folder

---
 src/yunohost/hook.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/yunohost/hook.py b/src/yunohost/hook.py
index 94126fd36..067a5d7a7 100644
--- a/src/yunohost/hook.py
+++ b/src/yunohost/hook.py
@@ -182,7 +182,8 @@ def hook_list(action, list_by='name', show_info=False):
     def _append_folder(d, folder):
         # Iterate over and add hook from a folder
         for f in os.listdir(folder + action):
-            if f[0] == '.' or f[-1] == '~' or f.endswith(".pyc"):
+            if f[0] == '.' or f[-1] == '~' or f.endswith(".pyc") \
+               or (f.startswith("__") and f.endswith("__")):
                 continue
             path = '%s%s/%s' % (folder, action, f)
             priority, name = _extract_filename_parts(f)

From 1ac59f987792f4763ad7323b0f3c59f871672538 Mon Sep 17 00:00:00 2001
From: Alexandre Aubin <alex.aubin@mailoo.org>
Date: Fri, 1 Jan 2021 05:04:54 +0100
Subject: [PATCH 11/22] More encode/decode fixes

---
 src/yunohost/backup.py      | 4 ++--
 src/yunohost/certificate.py | 2 +-
 src/yunohost/diagnosis.py   | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/yunohost/backup.py b/src/yunohost/backup.py
index dfed5cac1..a22c33f15 100644
--- a/src/yunohost/backup.py
+++ b/src/yunohost/backup.py
@@ -177,11 +177,11 @@ class BackupRestoreTargetsManager(object):
             or (exclude and isinstance(exclude, list) and not include)
 
         if include:
-            return [target.encode("Utf-8") for target in self.targets[category]
+            return [target for target in self.targets[category]
                     if self.results[category][target] in include]
 
         if exclude:
-            return [target.encode("Utf-8") for target in self.targets[category]
+            return [target for target in self.targets[category]
                     if self.results[category][target] not in exclude]
 
 
diff --git a/src/yunohost/certificate.py b/src/yunohost/certificate.py
index fc81ae0a6..421303615 100644
--- a/src/yunohost/certificate.py
+++ b/src/yunohost/certificate.py
@@ -638,7 +638,7 @@ def _get_status(domain):
     cert_subject = cert.get_subject().CN
     cert_issuer = cert.get_issuer().CN
     organization_name = cert.get_issuer().O
-    valid_up_to = datetime.strptime(cert.get_notAfter(), "%Y%m%d%H%M%SZ")
+    valid_up_to = datetime.strptime(cert.get_notAfter().decode('utf-8'), "%Y%m%d%H%M%SZ")
     days_remaining = (valid_up_to - datetime.utcnow()).days
 
     if cert_issuer == _name_self_CA():
diff --git a/src/yunohost/diagnosis.py b/src/yunohost/diagnosis.py
index e4dd84f6d..93ece21fc 100644
--- a/src/yunohost/diagnosis.py
+++ b/src/yunohost/diagnosis.py
@@ -451,7 +451,7 @@ class Diagnoser():
         key = "diagnosis_description_" + id_
         descr = m18n.n(key)
         # If no description available, fallback to id
-        return descr if descr.decode('utf-8') != key else id_
+        return descr if descr != key else id_
 
     @staticmethod
     def i18n(report, force_remove_html_tags=False):

From caa5e07d4109e6d04bebaaf4bb2b88f2bc90d3c6 Mon Sep 17 00:00:00 2001
From: Alexandre Aubin <alex.aubin@mailoo.org>
Date: Fri, 1 Jan 2021 05:20:04 +0100
Subject: [PATCH 12/22] X-Python-Version is obsolete

---
 debian/control | 1 -
 1 file changed, 1 deletion(-)

diff --git a/debian/control b/debian/control
index 3d7dc41b9..4e57c7a84 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,6 @@ Priority: extra
 Maintainer: YunoHost Contributors <contrib@yunohost.org>
 Build-Depends: debhelper (>=9), dh-systemd, dh-python, python3-all (>= 3.7), python3-yaml, python3-jinja2
 Standards-Version: 3.9.6
-X-Python-Version: >= 3.7
 Homepage: https://yunohost.org/
 
 Package: yunohost

From bbfd5eb9d042c6d8fbaa85644765d5f1deb7591e Mon Sep 17 00:00:00 2001
From: Alexandre Aubin <alex.aubin@mailoo.org>
Date: Sat, 2 Jan 2021 18:39:36 +0100
Subject: [PATCH 13/22] python3: Gotta add list() when we manipulate the dict
 during the loop

---
 src/yunohost/service.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/yunohost/service.py b/src/yunohost/service.py
index 0b6860e49..36d6e2797 100644
--- a/src/yunohost/service.py
+++ b/src/yunohost/service.py
@@ -599,7 +599,7 @@ def _get_services():
 
     # some services are marked as None to remove them from YunoHost
     # filter this
-    for key, value in services.items():
+    for key, value in list(services.items()):
         if value is None:
             del services[key]
 

From 0781150f2005b478c3d58984ac300a2406e0342f Mon Sep 17 00:00:00 2001
From: Alexandre Aubin <alex.aubin@mailoo.org>
Date: Sat, 2 Jan 2021 18:43:58 +0100
Subject: [PATCH 14/22] Remove python2.7 lint from CI

---
 .gitlab/ci/lint.gitlab-ci.yml | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/.gitlab/ci/lint.gitlab-ci.yml b/.gitlab/ci/lint.gitlab-ci.yml
index 8db1ee756..d240a3af6 100644
--- a/.gitlab/ci/lint.gitlab-ci.yml
+++ b/.gitlab/ci/lint.gitlab-ci.yml
@@ -3,14 +3,6 @@
 ########################################
 # later we must fix lint and format-check jobs and remove "allow_failure"
 
-lint27:
-  stage: lint
-  image: "before-install"
-  needs: []
-  allow_failure: true
-  script:
-    - tox -e py27-lint
-
 lint37:
   stage: lint
   image: "before-install"
@@ -19,13 +11,6 @@ lint37:
   script:
     - tox -e py37-lint
 
-invalidcode27:
-  stage: lint
-  image: "before-install"
-  needs: []
-  script:
-    - tox -e py27-invalidcode
-
 invalidcode37:
   stage: lint
   image: "before-install"

From c755f1701558ac8791af9c9c3bd15ea45f6139aa Mon Sep 17 00:00:00 2001
From: Alexandre Aubin <alex.aubin@mailoo.org>
Date: Sat, 2 Jan 2021 18:54:00 +0100
Subject: [PATCH 15/22] python -> python3 in ci's yml

---
 .gitlab/ci/test.gitlab-ci.yml | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/.gitlab/ci/test.gitlab-ci.yml b/.gitlab/ci/test.gitlab-ci.yml
index ef21731f3..6cbb89d0c 100644
--- a/.gitlab/ci/test.gitlab-ci.yml
+++ b/.gitlab/ci/test.gitlab-ci.yml
@@ -36,7 +36,7 @@ full-tests:
     - *install_debs
     - yunohost tools postinstall -d domain.tld -p the_password --ignore-dyndns
   script:
-    - python -m pytest --cov=yunohost tests/ src/yunohost/tests/ --junitxml=report.xml
+    - python3 -m pytest --cov=yunohost tests/ src/yunohost/tests/ --junitxml=report.xml
   needs:
       - job: build-yunohost
         artifacts: true
@@ -51,70 +51,70 @@ full-tests:
 root-tests:
   extends: .test-stage
   script:
-    - python -m pytest tests
+    - python3 -m pytest tests
 
 test-apps:
   extends: .test-stage
   script:
     - cd src/yunohost
-    - python -m pytest tests/test_apps.py
+    - python3 -m pytest tests/test_apps.py
 
 test-appscatalog:
   extends: .test-stage
   script:
     - cd src/yunohost
-    - python -m pytest tests/test_appscatalog.py
+    - python3 -m pytest tests/test_appscatalog.py
 
 test-appurl:
   extends: .test-stage
   script:
     - cd src/yunohost
-    - python -m pytest tests/test_appurl.py
+    - python3 -m pytest tests/test_appurl.py
 
 test-apps-arguments-parsing:
   extends: .test-stage
   script:
     - cd src/yunohost
-    - python -m pytest tests/test_apps_arguments_parsing.py
+    - python3 -m pytest tests/test_apps_arguments_parsing.py
 
 test-backuprestore:
   extends: .test-stage
   script:
     - cd src/yunohost
-    - python -m pytest tests/test_backuprestore.py
+    - python3 -m pytest tests/test_backuprestore.py
 
 test-changeurl:
   extends: .test-stage
   script:
     - cd src/yunohost
-    - python -m pytest tests/test_changeurl.py
+    - python3 -m pytest tests/test_changeurl.py
 
 test-permission:
   extends: .test-stage
   script:
     - cd src/yunohost
-    - python -m pytest tests/test_permission.py
+    - python3 -m pytest tests/test_permission.py
 
 test-settings:
   extends: .test-stage
   script:
     - cd src/yunohost
-    - python -m pytest tests/test_settings.py
+    - python3 -m pytest tests/test_settings.py
 
 test-user-group:
   extends: .test-stage
   script:
     - cd src/yunohost
-    - python -m pytest tests/test_user-group.py
+    - python3 -m pytest tests/test_user-group.py
     
 test-regenconf:
   extends: .test-stage
   script:
     - cd src/yunohost
-    - python -m pytest tests/test_regenconf.py
+    - python3 -m pytest tests/test_regenconf.py
 
 test-service:
   extends: .test-stage
   script:
     - cd src/yunohost
-    - python -m pytest tests/test_service.py
+    - python3 -m pytest tests/test_service.py

From 4ddf632e75086d5e431dfabee77ce4538cecb37d Mon Sep 17 00:00:00 2001
From: Alexandre Aubin <alex.aubin@mailoo.org>
Date: Sat, 2 Jan 2021 19:10:00 +0100
Subject: [PATCH 16/22] We don't need that print ?

---
 src/yunohost/tests/test_backuprestore.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/yunohost/tests/test_backuprestore.py b/src/yunohost/tests/test_backuprestore.py
index b88fbd5b3..583456cc5 100644
--- a/src/yunohost/tests/test_backuprestore.py
+++ b/src/yunohost/tests/test_backuprestore.py
@@ -23,8 +23,6 @@ def setup_function(function):
     global maindomain
     maindomain = _get_maindomain()
 
-    print ""
-
     assert backup_test_dependencies_are_met()
 
     clean_tmp_backup_directory()

From 2b12b67847e913c16754020127b6da816cc4a854 Mon Sep 17 00:00:00 2001
From: Alexandre Aubin <alex.aubin@mailoo.org>
Date: Sat, 2 Jan 2021 19:48:44 +0100
Subject: [PATCH 17/22] python3: Add some list() where that sounds relevant

---
 src/yunohost/app.py          | 2 +-
 src/yunohost/backup.py       | 2 +-
 src/yunohost/permission.py   | 4 ++--
 src/yunohost/service.py      | 2 +-
 src/yunohost/utils/legacy.py | 4 ++--
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/yunohost/app.py b/src/yunohost/app.py
index 0b3f40390..27a8a753f 100644
--- a/src/yunohost/app.py
+++ b/src/yunohost/app.py
@@ -2301,7 +2301,7 @@ def _value_for_locale(values):
             continue
 
     # Fallback to first value
-    return values.values()[0]
+    return list(values.values())[0]
 
 
 def _check_manifest_requirements(manifest, app_instance_name):
diff --git a/src/yunohost/backup.py b/src/yunohost/backup.py
index a22c33f15..ad5b995e7 100644
--- a/src/yunohost/backup.py
+++ b/src/yunohost/backup.py
@@ -600,7 +600,7 @@ class BackupManager():
                       for hook, infos in ret.items()
                       if any(result["state"] == "failed" for result in infos.values())}
 
-        if ret_succeed.keys() != []:
+        if list(ret_succeed.keys()) != []:
             self.system_return = ret_succeed
 
         # Add files from targets (which they put in the CSV) to the list of
diff --git a/src/yunohost/permission.py b/src/yunohost/permission.py
index 547510323..92c2c059f 100644
--- a/src/yunohost/permission.py
+++ b/src/yunohost/permission.py
@@ -106,7 +106,7 @@ def user_permission_list(short=False, full=False, ignore_system_perms=False, abs
             infos["label"] = "%s (%s)" % (main_perm_label, infos["label"])
 
     if short:
-        permissions = permissions.keys()
+        permissions = list(permissions.keys())
 
     return {'permissions': permissions}
 
@@ -668,7 +668,7 @@ def _validate_and_sanitize_permission_url(url, app_base_path, app):
     For example:
        re:/api/[A-Z]*$               -> domain.tld/app/api/[A-Z]*$
        re:domain.tld/app/api/[A-Z]*$ -> domain.tld/app/api/[A-Z]*$
-       
+
     We can also have less-trivial regexes like:
         re:^\/api\/.*|\/scripts\/api.js$
     """
diff --git a/src/yunohost/service.py b/src/yunohost/service.py
index 36d6e2797..347932add 100644
--- a/src/yunohost/service.py
+++ b/src/yunohost/service.py
@@ -490,7 +490,7 @@ def service_regen_conf(names=[], with_diff=False, force=False, dry_run=False,
             raise YunohostError('service_unknown', service=name)
 
     if names is []:
-        names = services.keys()
+        names = list(services.keys())
 
     logger.warning(m18n.n("service_regen_conf_is_deprecated"))
 
diff --git a/src/yunohost/utils/legacy.py b/src/yunohost/utils/legacy.py
index 1cc0246f3..11d483754 100644
--- a/src/yunohost/utils/legacy.py
+++ b/src/yunohost/utils/legacy.py
@@ -100,7 +100,7 @@ class SetupGroupPermissions():
 
             url = "/" if domain and path else None
             if permission:
-                known_users = user_list()["users"].keys()
+                known_users = list(user_list()["users"].keys())
                 allowed = [user for user in permission.split(',') if user in known_users]
             else:
                 allowed = ["all_users"]
@@ -235,7 +235,7 @@ def translate_legacy_rules_in_ssowant_conf_json_persistent():
     protected_urls = persistent.get("protected_urls", []) + ["re:" + r for r in persistent.get("protected_regex", [])]
     unprotected_urls = persistent.get("unprotected_urls", []) + ["re:" + r for r in persistent.get("unprotected_regex", [])]
 
-    known_users = user_list()["users"].keys()
+    known_users = list(user_list()["users"].keys())
 
     for legacy_rule in legacy_rules:
         if legacy_rule in persistent:

From 112054f3454d0103ca0638b1512691aeba0d1c65 Mon Sep 17 00:00:00 2001
From: Alexandre Aubin <alex.aubin@mailoo.org>
Date: Sat, 2 Jan 2021 19:51:16 +0100
Subject: [PATCH 18/22] Gotta decode the output of subprocess

---
 src/yunohost/tests/test_backuprestore.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/yunohost/tests/test_backuprestore.py b/src/yunohost/tests/test_backuprestore.py
index 583456cc5..c1f211d1b 100644
--- a/src/yunohost/tests/test_backuprestore.py
+++ b/src/yunohost/tests/test_backuprestore.py
@@ -148,7 +148,7 @@ def clean_tmp_backup_directory():
     if tmp_backup_directory_is_empty():
         return
 
-    mount_lines = subprocess.check_output("mount").split("\n")
+    mount_lines = subprocess.check_output("mount").decode().split("\n")
 
     points_to_umount = [line.split(" ")[2]
                         for line in mount_lines
@@ -636,6 +636,7 @@ def test_backup_binds_are_readonly(mocker, monkeypatch):
         confssh = os.path.join(self.work_dir, "conf/ssh")
         output = subprocess.check_output("touch %s/test 2>&1 || true" % confssh,
                                          shell=True, env={'LANG': 'en_US.UTF-8'})
+        output = output.decode()
 
         assert "Read-only file system" in output
 

From 58522d4105eb4730f3d3f5f26819d7bc8f1e167d Mon Sep 17 00:00:00 2001
From: Alexandre Aubin <alex.aubin@mailoo.org>
Date: Sat, 2 Jan 2021 20:31:42 +0100
Subject: [PATCH 19/22] Had a buggy exception here ... this syntax ain't
 supported anymore in python3

---
 src/yunohost/app.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/yunohost/app.py b/src/yunohost/app.py
index 27a8a753f..669463fcd 100644
--- a/src/yunohost/app.py
+++ b/src/yunohost/app.py
@@ -2910,7 +2910,7 @@ def _load_apps_catalog():
         try:
             apps_catalog_content = read_json(cache_file) if os.path.exists(cache_file) else None
         except Exception as e:
-            raise "Unable to read cache for apps_catalog %s : %s"
+            raise YunohostError("Unable to read cache for apps_catalog %s : %s" % (cache_file, e), raw_msg=True)
 
         # Check that the version of the data matches version ....
         # ... otherwise it means we updated yunohost in the meantime

From de126fcdceca9dcbf177170ebfae81aa1aee2d7b Mon Sep 17 00:00:00 2001
From: Alexandre Aubin <alex.aubin@mailoo.org>
Date: Sat, 2 Jan 2021 20:40:51 +0100
Subject: [PATCH 20/22] Don't allow failure for invalid python3 code + fix
 unsued variables

---
 .gitlab/ci/lint.gitlab-ci.yml                                   | 1 -
 src/yunohost/app.py                                             | 2 +-
 src/yunohost/backup.py                                          | 2 +-
 .../data_migrations/0019_extend_permissions_features.py         | 2 +-
 src/yunohost/utils/legacy.py                                    | 2 +-
 5 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/.gitlab/ci/lint.gitlab-ci.yml b/.gitlab/ci/lint.gitlab-ci.yml
index d240a3af6..dabe33d62 100644
--- a/.gitlab/ci/lint.gitlab-ci.yml
+++ b/.gitlab/ci/lint.gitlab-ci.yml
@@ -14,7 +14,6 @@ lint37:
 invalidcode37:
   stage: lint
   image: "before-install"
-  allow_failure: true
   needs: []
   script:
     - tox -e py37-invalidcode
diff --git a/src/yunohost/app.py b/src/yunohost/app.py
index 669463fcd..c32596fa7 100644
--- a/src/yunohost/app.py
+++ b/src/yunohost/app.py
@@ -831,7 +831,7 @@ def app_install(operation_logger, app, label=None, args=None, no_remove_on_failu
         logger.error(m18n.n("app_install_failed", app=app_id, error=error))
         failure_message_with_debug_instructions = operation_logger.error(error)
     # Something wrong happened in Yunohost's code (most probably hook_exec)
-    except Exception as e:
+    except Exception:
         import traceback
         error = m18n.n('unexpected_error', error="\n" + traceback.format_exc())
         logger.error(m18n.n("app_install_failed", app=app_id, error=error))
diff --git a/src/yunohost/backup.py b/src/yunohost/backup.py
index ad5b995e7..18736ef81 100644
--- a/src/yunohost/backup.py
+++ b/src/yunohost/backup.py
@@ -1644,7 +1644,7 @@ class BackupMethod(object):
                 try:
                     subprocess.check_call(["mount", "--rbind", src, dest])
                     subprocess.check_call(["mount", "-o", "remount,ro,bind", dest])
-                except Exception as e:
+                except Exception:
                     logger.warning(m18n.n("backup_couldnt_bind", src=src, dest=dest))
                     # To check if dest is mounted, use /proc/mounts that
                     # escape spaces as \040
diff --git a/src/yunohost/data_migrations/0019_extend_permissions_features.py b/src/yunohost/data_migrations/0019_extend_permissions_features.py
index b20b92e62..6c292e014 100644
--- a/src/yunohost/data_migrations/0019_extend_permissions_features.py
+++ b/src/yunohost/data_migrations/0019_extend_permissions_features.py
@@ -98,7 +98,7 @@ class MyMigration(Migration):
             # Migrate old settings
             migrate_legacy_permission_settings()
 
-        except Exception as e:
+        except Exception:
             logger.warn(m18n.n("migration_0019_migration_failed_trying_to_rollback"))
             os.system("systemctl stop slapd")
             os.system("rm -r /etc/ldap/slapd.d")  # To be sure that we don't keep some part of the old config
diff --git a/src/yunohost/utils/legacy.py b/src/yunohost/utils/legacy.py
index 11d483754..ca187baa1 100644
--- a/src/yunohost/utils/legacy.py
+++ b/src/yunohost/utils/legacy.py
@@ -22,7 +22,7 @@ class SetupGroupPermissions():
         try:
             objects = ldap.search(target + ",dc=yunohost,dc=org")
         # ldap search will raise an exception if no corresponding object is found >.> ...
-        except Exception as e:
+        except Exception:
             logger.debug("%s does not exist, no need to delete it" % target)
             return
 

From c272d20a31ad4619e4153d70db8b5c6fcf226ba4 Mon Sep 17 00:00:00 2001
From: Alexandre Aubin <alex.aubin@mailoo.org>
Date: Sun, 3 Jan 2021 04:00:51 +0100
Subject: [PATCH 21/22] Zblerg, forgot an unused 'e'

---
 src/yunohost/backup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/yunohost/backup.py b/src/yunohost/backup.py
index 18736ef81..6b6fcf2df 100644
--- a/src/yunohost/backup.py
+++ b/src/yunohost/backup.py
@@ -2166,7 +2166,7 @@ def backup_list(with_info=False, human_readable=False):
                 d[archive] = backup_info(archive, human_readable=human_readable)
             except YunohostError as e:
                 logger.warning(str(e))
-            except Exception as e:
+            except Exception:
                 import traceback
                 logger.warning("Could not check infos for archive %s: %s" % (archive, '\n' + traceback.format_exc()))
 

From a665c702d0a96d7617892acf3cf3e39c62790cd0 Mon Sep 17 00:00:00 2001
From: Alexandre Aubin <alex.aubin@mailoo.org>
Date: Sun, 10 Jan 2021 02:07:24 +0100
Subject: [PATCH 22/22] Annnd of course we have references to python2 in bash
 stuff and other misc scripts

---
 data/helpers.d/setting            | 2 +-
 data/helpers.d/utils              | 2 +-
 data/hooks/conf_regen/01-yunohost | 2 +-
 debian/rules                      | 2 +-
 doc/generate_helper_doc.py        | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/data/helpers.d/setting b/data/helpers.d/setting
index af52b8321..d1babd140 100644
--- a/data/helpers.d/setting
+++ b/data/helpers.d/setting
@@ -78,7 +78,7 @@ ynh_app_setting_delete() {
 #
 ynh_app_setting()
 {
-    ACTION="$1" APP="$2" KEY="$3" VALUE="${4:-}" python2.7 - <<EOF
+    ACTION="$1" APP="$2" KEY="$3" VALUE="${4:-}" python3 - <<EOF
 import os, yaml, sys
 app, action = os.environ['APP'], os.environ['ACTION'].lower()
 key, value = os.environ['KEY'], os.environ.get('VALUE', None)
diff --git a/data/helpers.d/utils b/data/helpers.d/utils
index 3ab56747e..d1f5e16b7 100644
--- a/data/helpers.d/utils
+++ b/data/helpers.d/utils
@@ -421,7 +421,7 @@ ynh_render_template() {
     local output_path=$2
     mkdir -p "$(dirname $output_path)"
     # Taken from https://stackoverflow.com/a/35009576
-    python2.7 -c 'import os, sys, jinja2; sys.stdout.write(
+    python3 -c 'import os, sys, jinja2; sys.stdout.write(
                     jinja2.Template(sys.stdin.read()
                     ).render(os.environ));' < $template_path > $output_path
 }
diff --git a/data/hooks/conf_regen/01-yunohost b/data/hooks/conf_regen/01-yunohost
index c4120d487..6ac61d07a 100755
--- a/data/hooks/conf_regen/01-yunohost
+++ b/data/hooks/conf_regen/01-yunohost
@@ -115,7 +115,7 @@ do_post_regen() {
 }
 
 _update_services() {
-  python2 - << EOF
+  python3 - << EOF
 import yaml
 
 
diff --git a/debian/rules b/debian/rules
index 8afe372b5..54ebc5781 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,7 +5,7 @@
 #export DH_VERBOSE=1
 
 %:
-	dh ${@} --with=python2,systemd
+	dh ${@} --with=python3,systemd
 
 override_dh_auto_build:
 	# Generate bash completion file
diff --git a/doc/generate_helper_doc.py b/doc/generate_helper_doc.py
index bc9611c8f..908d6300e 100644
--- a/doc/generate_helper_doc.py
+++ b/doc/generate_helper_doc.py
@@ -1,4 +1,4 @@
-#!/usr/env/python2.7
+#!/usr/env/python3
 
 import os
 import glob