From 9e05ed5859732e365a1f425eebc15102b0d3abe9 Mon Sep 17 00:00:00 2001 From: Valentin Deniaud Date: Mon, 20 Sep 2021 16:00:45 +0200 Subject: [PATCH 22/59] misc: fix assignment-from-no-return pylint error (#56982) --- src/authentic2/custom_user/models.py | 3 +-- src/authentic2/manager/user_views.py | 4 ++-- src/authentic2/manager/views.py | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/authentic2/custom_user/models.py b/src/authentic2/custom_user/models.py index aade3958..7de79fa0 100644 --- a/src/authentic2/custom_user/models.py +++ b/src/authentic2/custom_user/models.py @@ -336,7 +336,7 @@ class User(AbstractBaseUser, PermissionMixin): def save(self, *args, **kwargs): update_fields = kwargs.get('update_fields') - rc = super().save(*args, **kwargs) + super().save(*args, **kwargs) if not update_fields or not set(update_fields).isdisjoint({'first_name', 'last_name'}): try: self.attributes.first_name @@ -352,7 +352,6 @@ class User(AbstractBaseUser, PermissionMixin): else: if self.attributes.last_name != self.last_name: self.attributes.last_name = self.last_name - return rc def can_change_password(self): return True diff --git a/src/authentic2/manager/user_views.py b/src/authentic2/manager/user_views.py index 57ea081e..1fa7d56c 100644 --- a/src/authentic2/manager/user_views.py +++ b/src/authentic2/manager/user_views.py @@ -666,8 +666,8 @@ class UserRolesView(HideOUColumnMixin, BaseSubTableView): qs = list(qs) return qs - def authorize(self, request, *args, **kwargs): - response = super().authorize(request, *args, **kwargs) + def dispatch(self, request, *args, **kwargs): + response = super().dispatch(request, *args, **kwargs) # pylint: disable=assignment-from-no-return if response is not None: return response if not UserDetailView.has_perm_on_roles(request.user, self.object): diff --git a/src/authentic2/manager/views.py b/src/authentic2/manager/views.py index 9446d8ef..8a6c5c5b 100644 --- a/src/authentic2/manager/views.py +++ b/src/authentic2/manager/views.py @@ -119,7 +119,7 @@ class PermissionMixin: raise PermissionDenied def dispatch(self, request, *args, **kwargs): - response = self.authorize(request, *args, **kwargs) + response = self.authorize(request, *args, **kwargs) # pylint: disable=assignment-from-no-return if response is not None: return response return super().dispatch(request, *args, **kwargs) -- 2.30.2