ldap_clean_users - Does not catch Exception and fix flake8 warning

Author: Jordi Romera

django_python3_ldap/management/commands/ldap_clean_users.py

@@ -1,6 +1,7 @@
 from django.contrib.auth import get_user_model
 from django.core.management.base import BaseCommand, CommandError
 from django.db import transaction
+from django.db.models import ProtectedError
 
 from django_python3_ldap import ldap
 from django_python3_ldap.conf import settings
@@ -54,12 +55,11 @@ def _iter_local_users(User, lookups, superuser, staff):
                     yield User.objects.get(**lookup,
                                            is_superuser=superuser,
                                            is_staff=staff)
-                except Exception as e:
+                except User.DoesNotExist:
                     raise CommandError("Could not find user with lookup : {lookup}".format(
                         lookup=lookup,
                     ))
 
-
     @staticmethod
     def _remove(user, purge):
         """
@@ -69,19 +69,15 @@ def _remove(user, purge):
             # Delete local user
             try:
                 user.delete()
-            except Exception as e:
-                raise CommandError("Could not purge user {user}".format(
+            except ProtectedError as e:
+                raise CommandError("Could not purge user {user} : {e}".format(
                     user=user,
+                    e=e
                 ))
         else:
             # Deactivate local user
-            try:
-                user.is_active = False
-                user.save()
-            except Exception as e:
-                raise CommandError("Could not deactivate user {user}".format(
-                    user=user,
-                ))
+            user.is_active = False
+            user.save()
 
     @transaction.atomic()
     def handle(self, *args, **kwargs):
@@ -101,7 +97,7 @@ def handle(self, *args, **kwargs):
             for user in self._iter_local_users(User, lookups, superuser, staff):
                 # For each local users
                 # Check if user still exists
-                user_kwargs  = {
+                user_kwargs = {
                     User.USERNAME_FIELD: getattr(user, User.USERNAME_FIELD)
                 }
                 if connection.has_user(**user_kwargs):

django_python3_ldap/tests.py

@@ -262,9 +262,10 @@ def testImportFunc(self):
         with self.settings(LDAP_AUTH_SYNC_USER_RELATIONS='django.contrib.auth.get_user_model'):
             self.assertTrue(callable(import_func(settings.LDAP_AUTH_SYNC_USER_RELATIONS)))
 
-    # User cleaning.
-
     def testCleanUsersDeactivate(self):
+        """
+        ldap_clean_users management command test
+        """
         from django.contrib.auth import get_user_model
         User = get_user_model()
         _username = "nonldap{user}".format(user=settings.LDAP_AUTH_TEST_USER_USERNAME)
@@ -280,7 +281,9 @@ def testCleanUsersDeactivate(self):
         self.assertEqual(user_count_1, user_count_2)
         self.assertEqual(User.objects.get(username=_username).is_active, False)
 
-        ### Test with lookup
+        """
+        Test with lookup
+        """
         # Reactivate user
         user = User.objects.get(username=_username)
         user.is_active = True
@@ -309,12 +312,12 @@ def testCleanUsersDeactivate(self):
         self.assertEqual(User.objects.get(username=_username).is_active, False)
         self.assertEqual(User.objects.get(username=_usernameLookup).is_active, True)
         # Lookup a non existing user (raise a CommandError)
-        try:
+        with self.assertRaises(CommandError):
             call_command("ldap_clean_users", 'doesnonexist', verbosity=0)
-        except Exception as e:
-            print(e)
 
-        ### Test with superuser
+        """
+        Test with superuser
+        """
         # Reactivate first user and promote to superuser
         user = User.objects.get(username=_username)
         user.is_active = True
@@ -330,7 +333,9 @@ def testCleanUsersDeactivate(self):
         call_command("ldap_clean_users", superuser=True, verbosity=0)
         self.assertEqual(User.objects.get(username=_username).is_active, False)
 
-        ### Test with staff user
+        """
+        Test with staff user
+        """
         # Reactivate first user and promote to staff
         user = User.objects.get(username=_username)
         user.is_active = True
@@ -348,6 +353,9 @@ def testCleanUsersDeactivate(self):
         self.assertEqual(User.objects.get(username=_username).is_active, False)
 
     def testCleanUsersPurge(self):
+        """
+        ldap_clean_users management command test with purge argument
+        """
         from django.contrib.auth import get_user_model
         User = get_user_model()
         user = User.objects.create_user(