Small change of misago.acl.cache api

misago/acl/cache.py

@@ -5,12 +5,12 @@ from misago.cache.versions import invalidate_cache
 from . import ACL_CACHE
 
 
-def get(user, cache_versions):
+def get_acl_cache(user, cache_versions):
     key = get_cache_key(user, cache_versions)
     return cache.get(key)
 
 
-def set(user, cache_versions, user_acl):
+def set_acl_cache(user, cache_versions, user_acl):
     key = get_cache_key(user, cache_versions)
     cache.set(key, user_acl)
 
@@ -19,5 +19,5 @@ def get_cache_key(user, cache_versions):
     return 'acl_%s_%s' % (user.acl_key, cache_versions[ACL_CACHE])
 
 
-def clear():
+def clear_acl_cache():
     invalidate_cache(ACL_CACHE)

misago/acl/useracl.py

@@ -1,14 +1,15 @@
 import copy
 
-from . import buildacl, cache
+from . import buildacl
+from .cache import get_acl_cache, set_acl_cache
 from .providers import providers
 
 
 def get_user_acl(user, cache_versions):
-    user_acl = cache.get(user, cache_versions)
+    user_acl = get_acl_cache(user, cache_versions)
     if user_acl is None:
         user_acl = buildacl.build_acl(user.get_roles())
-        cache.set(user, cache_versions, user_acl)
+        set_acl_cache(user, cache_versions, user_acl)
     user_acl["user_id"] = user.id
     user_acl["is_authenticated"] = bool(user.is_authenticated)
     user_acl["is_anonymous"] = bool(user.is_anonymous)

misago/categories/management/commands/fixcategoriestree.py

@@ -1,6 +1,6 @@
 from django.core.management.base import BaseCommand
 
-from misago.acl.cache import clear as clear_acl_cache
+from misago.acl.cache import clear_acl_cache
 from misago.categories.models import Category
 
 

misago/categories/models.py

@@ -3,7 +3,7 @@ from mptt.models import MPTTModel, TreeForeignKey
 
 from django.db import models
 
-from misago.acl.cache import clear as clear_acl_cache
+from misago.acl.cache import clear_acl_cache
 from misago.acl.models import BaseRole
 from misago.conf import settings
 from misago.core.cache import cache

misago/categories/views/categoriesadmin.py

@@ -2,7 +2,7 @@ from django.contrib import messages
 from django.shortcuts import redirect
 from django.utils.translation import gettext_lazy as _
 
-from misago.acl.cache import clear as clear_acl_cache
+from misago.acl.cache import clear_acl_cache
 from misago.admin.views import generic
 from misago.categories import THREADS_ROOT_NAME
 from misago.categories.forms import CategoryFormFactory, DeleteFormFactory

misago/categories/views/permsadmin.py

@@ -2,7 +2,7 @@ from django.contrib import messages
 from django.shortcuts import redirect
 from django.utils.translation import gettext_lazy as _
 
-from misago.acl.cache import clear as clear_acl_cache
+from misago.acl.cache import clear_acl_cache
 from misago.acl.forms import get_permissions_forms
 from misago.acl.models import Role
 from misago.acl.views import RoleAdmin, RolesList

misago/faker/management/commands/createfakecategories.py

@@ -5,7 +5,7 @@ from faker import Factory
 
 from django.core.management.base import BaseCommand
 
-from misago.acl.cache import clear as clear_acl_cache
+from misago.acl.cache import clear_acl_cache
 from misago.categories.models import Category, RoleCategoryACL
 from misago.core.management.progressbar import show_progress
 

misago/users/models/rank.py

@@ -1,7 +1,7 @@
 from django.db import models, transaction
 from django.urls import reverse
 
-from misago.acl.cache import clear as clear_acl_cache
+from misago.acl.cache import clear_acl_cache
 from misago.core.utils import slugify