Merge branch 'master' into oidc_timeout

czosel · Jan 15, 2019 · 4188cff · 4188cff
2 parents bd4af47 + a19bffe
commit 4188cff
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/caluma/core/permissions.py b/caluma/core/permissions.py
@@ -66,7 +66,7 @@ class BasePermission(object):
 
     def __init__(self):
         perm_fns = inspect.getmembers(self, lambda m: hasattr(m, "_permission"))
-        perm_muts = [str(fn._permission) for _, fn in perm_fns]
+        perm_muts = [fn._permission.__name__ for _, fn in perm_fns]
         perm_muts_dups = list_duplicates(perm_muts)
         if perm_muts_dups:
             raise ImproperlyConfigured(
@@ -78,7 +78,7 @@ def __init__(self):
         obj_perm_fns = inspect.getmembers(
             self, lambda m: hasattr(m, "_object_permission")
         )
-        obj_perm_muts = [str(fn._object_permission) for _, fn in obj_perm_fns]
+        obj_perm_muts = [fn._object_permission.__name__ for _, fn in obj_perm_fns]
         obj_perm_muts_dups = list_duplicates(obj_perm_muts)
         if obj_perm_muts_dups:
             raise ImproperlyConfigured(

diff --git a/caluma/core/visibilities.py b/caluma/core/visibilities.py
@@ -45,7 +45,7 @@ def __init__(self):
         queryset_fns = inspect.getmembers(
             self, lambda m: hasattr(m, "_filter_queryset_for")
         )
-        queryset_nodes = [str(fn._filter_queryset_for) for _, fn in queryset_fns]
+        queryset_nodes = [fn._filter_queryset_for.__name__ for _, fn in queryset_fns]
         queryset_nodes_dups = list_duplicates(queryset_nodes)
         if queryset_nodes_dups:
             raise ImproperlyConfigured(