fix: change logic for check None in enforcer_name variable

pycasbin · Apr 23, 2024 · efd5f3d · efd5f3d
1 parent e7119c7
commit efd5f3d
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 12 deletions.
diff --git a/dauthz/management/commands/group.py b/dauthz/management/commands/group.py
@@ -19,14 +19,13 @@ def add_arguments(self, parser):
         parser.add_argument("domain", nargs="?", type=str)
 
     def handle(self, *args, **options):
-        enforcer_name = options.get("enforcer")
-        if enforcer_name is None:
-            enforcer_name = "DEFAULT"
+        enforcer_name = options.get("enforcer") or "DEFAULT"
         handler_enforcer = None
+
         try:
             handler_enforcer = enforcers[enforcer_name]
         except KeyError:
-            raise Exception("Enforcer `" + enforcer_name + "` not found")
+            raise Exception(f"Enforcer `{enforcer_name}` not found")
 
         action = options.get("action")
         action = action.upper()
@@ -52,11 +51,9 @@ def handle(self, *args, **options):
             domain = options.get("domain")
             if domain is None:
                 res = handler_enforcer.has_grouping_policy(user, role)
-                self.stdout.write(f"User: {user} -> Role: {role} --> Result: {res}")
+                self.stdout.write(f"User: {user} -> Role: {role} -> Result: {res}")
             else:
                 res = handler_enforcer.has_grouping_policy(user, role, domain)
-                self.stdout.write(
-                    f"User: {user} -> Role: {role} -> Domain: {domain} -> Result: {res}"
-                )
+                self.stdout.write(f"User: {user} -> Role: {role} -> Domain: {domain} -> Result: {res}")
         else:
             self.stderr.write("Action not found")
diff --git a/dauthz/management/commands/policy.py b/dauthz/management/commands/policy.py
@@ -19,13 +19,13 @@ def add_arguments(self, parser):
         parser.add_argument("--enforcer", type=str, help="Name of Enforcer")
 
     def handle(self, *args, **options):
-        enforcer_name = options.get("enforcer", "DEFAULT")
+        enforcer_name = options.get("enforcer") or "DEFAULT"
         handler_enforcer = None
 
         try:
             handler_enforcer = enforcers[enforcer_name]
         except KeyError:
-            raise Exception("Enforcer `" + enforcer_name + "` not found")
+            raise Exception(f"Enforcer `{enforcer_name}` not found")
 
         action = options.get("action")
         action = action.upper()

diff --git a/dauthz/management/commands/role.py b/dauthz/management/commands/role.py
@@ -18,13 +18,13 @@ def add_arguments(self, parser):
         parser.add_argument("role", nargs="?", type=str)
 
     def handle(self, *args, **options):
-        enforcer_name = options.get("enforcer", "DEFAULT")
+        enforcer_name = options.get("enforcer") or "DEFAULT"
         handler_enforcer = None
 
         try:
             handler_enforcer = enforcers[enforcer_name]
         except KeyError:
-            raise Exception("Enforcer `" + enforcer_name + "` not found")
+            raise Exception(f"Enforcer `{enforcer_name}` not found")
 
         action = options.get("action")
         action = action.upper()