From 52e6f9a538df0a50a7c160b14859c6660d09f7e7 Mon Sep 17 00:00:00 2001 From: Valentin Deniaud Date: Mon, 20 Sep 2021 15:09:15 +0200 Subject: [PATCH 17/59] misc: fix no-self-argument pylint error (#56982) --- src/authentic2/data_transfer.py | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/src/authentic2/data_transfer.py b/src/authentic2/data_transfer.py index 4787c8b7..0f11e5e5 100644 --- a/src/authentic2/data_transfer.py +++ b/src/authentic2/data_transfer.py @@ -171,6 +171,23 @@ class ImportContext: self.set_ou = set_ou +def wraps_validationerror(func): + @wraps(func) + def f(self, *args, **kwargs): + try: + return func(self, *args, **kwargs) + except ValidationError as e: + raise ValidationError( + _('Role "%(name)s": %(errors)s') + % { + 'name': self._role_d.get('name', self._role_d.get('slug')), + 'errors': lazy_join(', ', [v.message for v in e.error_list]), + } + ) + + return f + + class RoleDeserializer: def __init__(self, d, import_context): self._import_context = import_context @@ -190,22 +207,6 @@ class RoleDeserializer: else: self._role_d[key] = value - def wraps_validationerror(func): - @wraps(func) - def f(self, *args, **kwargs): - try: - return func(self, *args, **kwargs) - except ValidationError as e: - raise ValidationError( - _('Role "%(name)s": %(errors)s') - % { - 'name': self._role_d.get('name', self._role_d.get('slug')), - 'errors': lazy_join(', ', [v.message for v in e.error_list]), - } - ) - - return f - @wraps_validationerror def deserialize(self): if self._import_context.set_ou: -- 2.30.2