Merge branch 'dev' into 4.1

moulinette/interfaces/api.py

@@ -768,12 +768,15 @@ class Interface(BaseInterface):
 
         # Attempt to retrieve and set locale
         def api18n(callback):
+            def wrapper(*args, **kwargs):
                 try:
                     locale = request.params.pop("locale")
                 except KeyError:
                     locale = m18n.default_locale
                 m18n.set_locale(locale)
-            return callback
+                return callback(*args, **kwargs)
+
+            return wrapper
 
         # Install plugins
         app.install(filter_csrf)

test/src/ldap_server.py

@@ -103,7 +103,6 @@ class LDAPServer:
 
         ldap_interface.update("cn=admin", admin_dict)
 
-
     def _hash_user_password(self, password):
         """
         Copy pasta of what's in yunohost/user.py
@@ -112,8 +111,10 @@ class LDAPServer:
         import random
         import crypt
 
-        char_set = string.ascii_uppercase + string.ascii_lowercase + string.digits + "./"
-        salt = ''.join([random.SystemRandom().choice(char_set) for x in range(16)])
+        char_set = (
+            string.ascii_uppercase + string.ascii_lowercase + string.digits + "./"
+        )
+        salt = "".join([random.SystemRandom().choice(char_set) for x in range(16)])
 
-        salt = '$6$' + salt + '$'
-        return '{CRYPT}' + crypt.crypt(str(password), salt)
+        salt = "$6$" + salt + "$"
+        return "{CRYPT}" + crypt.crypt(str(password), salt)