From 5a87b3488cb0b6171c1d53838d645843dae172e1 Mon Sep 17 00:00:00 2001 From: Valentin Deniaud Date: Wed, 8 Dec 2021 15:03:25 +0100 Subject: [PATCH 2/2] data_transfer: simplify logic (#51464) --- src/authentic2/data_transfer.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/authentic2/data_transfer.py b/src/authentic2/data_transfer.py index 102bb6f6..3f06514a 100644 --- a/src/authentic2/data_transfer.py +++ b/src/authentic2/data_transfer.py @@ -214,7 +214,6 @@ class RoleDeserializer: def deserialize(self): if self._import_context.set_ou: ou = self._import_context.set_ou - has_ou = True elif 'ou' in self._role_d: ou_d = self._role_d['ou'] has_ou = bool(ou_d) @@ -227,7 +226,6 @@ class RoleDeserializer: ) elif self._import_context.set_absent_ou_to_default: ou = get_default_ou() - has_ou = True else: name = self._role_d.get('name') or self._role_d.get('slug') or self._role_d.get('uuid') raise ValidationError(_("Missing Organizational Unit for role: %s") % name) @@ -235,10 +233,8 @@ class RoleDeserializer: obj = search_role(self._role_d, ou=self._import_context.set_ou) kwargs = self._role_d.copy() - kwargs.pop('ou', None) + kwargs['ou'] = ou kwargs.pop('service', None) - if has_ou: - kwargs['ou'] = ou if 'uuid' in kwargs: if not isinstance(kwargs['uuid'], str): -- 2.30.2