feat: code refactoring

dauthz/backends/casbin_backend.py

@@ -28,7 +28,7 @@ def _get_permissions(self, user_obj, obj, from_name):
         if not user_obj.is_active or user_obj.is_anonymous or obj is not None:
             return set()
 
-        perm_cache_name = "_%s_perm_cache" % from_name
+        perm_cache_name = f"_{from_name}_perm_cache"
         if not hasattr(user_obj, perm_cache_name):
             policies = self.enforcer.get_implicit_permissions_for_user(user_obj.username)
             perms = tuple(map(tuple, policies))
@@ -41,8 +41,7 @@ def get_user_permissions(self, user_obj, obj=None):
         `user_permissions`.
         """
         policies = self.enforcer.get_permissions_for_user(user_obj.username)
-        res = tuple(map(tuple, policies))
-        return res
+        return tuple(map(tuple, policies))
 
     def get_all_permissions(self, user_obj, obj=None):
         """

dauthz/core.py

@@ -29,6 +29,7 @@ def __init__(self, enforcer_name: str, enforcer_conf: dict):
         watcher = enforcer_conf.get("WATCHER")
         if watcher:
             self.set_watcher(watcher)
+
         role_manager = enforcer_conf.get("ROLE_MANAGER")
         if role_manager:
             self.set_role_manager(role_manager)
@@ -38,6 +39,7 @@ def __init__(self, enforcer_name: str, enforcer_conf: dict):
 enforcer = None
 enforcers = {}
 enforcer_conf_list = getattr(settings, "DAUTHZ")
+
 for item in enforcer_conf_list.items():
     name = item[0]
     conf = item[1]

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("User: {} ---> Role: {} ---> Result: {}".format(user, role, res))
+                self.stdout.write(f"User: {user} -> Role: {role} -> Result: {res}")
             else:
                 res = handler_enforcer.has_grouping_policy(user, role, domain)
-                self.stdout.write(
-                    "User: {} ---> Role: {} ---> Domain: {} ---> Result: {}".format(user, role, domain, res)
-                )
+                self.stdout.write(f"User: {user} -> Role: {role} -> Domain: {domain} -> Result: {res}")
         else:
             self.stderr.write("Action not found")

dauthz/management/commands/policy.py

@@ -19,21 +19,21 @@ 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")
-        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()
+
         sub = options.get("sub")
         obj = options.get("obj")
         act = options.get("act")
+
         if action == "ADD":
             res = handler_enforcer.add_policy(sub, obj, act)
             if res is True:
@@ -43,6 +43,6 @@ def handle(self, *args, **options):
                 self.stderr.write("Policy not added success")
         elif action == "GET":
             res = handler_enforcer.enforce(sub, obj, act)
-            print("{}, {}, {} ---> {}".format(sub, obj, act, res))
+            print(f"{sub}, {obj}, {act} -> {res}")
         else:
             self.stderr.write("Action not found")

dauthz/management/commands/role.py

@@ -18,18 +18,19 @@ def add_arguments(self, parser):
         parser.add_argument("role", 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()
+
         user = options.get("user")
+
         if action == "ADD":
             role = options.get("role")
             if role is None:
@@ -43,6 +44,6 @@ def handle(self, *args, **options):
             self.stdout.write("Role added")
         elif action == "GET":
             res = handler_enforcer.get_roles_for_user(user)
-            print("user: {} ---> roles: {}".format(user, res))
+            print(f"User: {user} -> Roles: {res}")
         else:
             self.stderr.write("Action not found")

dauthz/utils.py

@@ -3,10 +3,9 @@
 
 def import_class(name):
     """Import class from string
-    e.g. `package.module.ClassToImport` returns the `ClasToImport` class"""
+    e.g. `package.module.ClassToImport` returns the `ClassToImport` class"""
     components = name.split(".")
     module_name = ".".join(components[:-1])
     class_name = components[-1]
     module = importlib.import_module(module_name)
-    class_ = getattr(module, class_name)
-    return class_
+    return getattr(module, class_name)