diff --git a/src/yunohost/backup.py b/src/yunohost/backup.py index 24313d416..a44819a33 100644 --- a/src/yunohost/backup.py +++ b/src/yunohost/backup.py @@ -2164,7 +2164,7 @@ def backup_list(with_info=False, human_readable=False): for a in result: try: d[a] = backup_info(a, human_readable=human_readable) - except YunohostError, e: + except YunohostError as e: logger.warning('%s: %s' % (a, e.strerror)) result = d diff --git a/src/yunohost/user.py b/src/yunohost/user.py index 313835fe0..1cec8922d 100644 --- a/src/yunohost/user.py +++ b/src/yunohost/user.py @@ -144,8 +144,7 @@ def user_create(operation_logger, auth, username, firstname, lastname, mail, pas # Check that the mail domain exists if mail.split("@")[1] not in domain_list(auth)['domains']: - raise YunohostError(m18n.n('mail_domain_unknown', - domain=mail.split("@")[1])) + raise YunohostError('mail_domain_unknown', domain=mail.split("@")[1]) operation_logger.start() @@ -323,8 +322,7 @@ def user_update(operation_logger, auth, username, firstname=None, lastname=None, ] auth.validate_uniqueness({'mail': mail}) if mail[mail.find('@') + 1:] not in domains: - raise YunohostError(m18n.n('mail_domain_unknown', - domain=mail[mail.find('@') + 1:])) + raise YunohostError('mail_domain_unknown', domain=mail[mail.find('@') + 1:]) if mail in aliases: raise YunohostError('mail_unavailable') diff --git a/src/yunohost/utils/password.py b/src/yunohost/utils/password.py index b86fa23b1..ddc59cbe9 100644 --- a/src/yunohost/utils/password.py +++ b/src/yunohost/utils/password.py @@ -91,7 +91,7 @@ class PasswordValidator(object): status, msg = self.validation_summary(password) if status == "error": - raise YunohostError(1, m18n.n(msg)) + raise YunohostError(msg) def validation_summary(self, password): """