constants in category model cleaned

misago/categories/__init__.py

@@ -1 +1,4 @@
+from .constants import *
+
+
 default_app_config = 'misago.categories.apps.MisagoCategoriesConfig'

misago/categories/constants.py

@@ -0,0 +1,2 @@
+PRIVATE_THREADS_ROOT_NAME = 'private_threads'
+THREADS_ROOT_NAME = 'root_category'

misago/categories/forms.py

@@ -9,7 +9,8 @@ from misago.core.forms import YesNoSwitch
 from misago.core.validators import validate_sluggable
 from misago.threads.threadtypes import trees_map
 
-from .models import THREADS_ROOT_NAME, Category, CategoryRole
+from . import THREADS_ROOT_NAME
+from .models import Category, CategoryRole
 
 
 """

misago/categories/models.py

@@ -12,10 +12,10 @@ from misago.core.cache import cache
 from misago.core.utils import slugify
 from misago.threads.threadtypes import trees_map
 
+from . import PRIVATE_THREADS_ROOT_NAME, THREADS_ROOT_NAME
+
 
 CACHE_NAME = 'misago_categories_tree'
-PRIVATE_THREADS_ROOT_NAME = 'private_threads'
-THREADS_ROOT_NAME = 'root_category'
 
 
 class CategoryManager(TreeManager):

misago/categories/tests/test_category_model.py

@@ -4,7 +4,8 @@ from misago.core.testutils import MisagoTestCase
 from misago.threads import testutils
 from misago.threads.threadtypes import trees_map
 
-from ..models import THREADS_ROOT_NAME, Category
+from misago.categories import THREADS_ROOT_NAME
+from misago.categories.models import Category
 
 
 class CategoryManagerTests(MisagoTestCase):

misago/categories/views/categoriesadmin.py

@@ -6,8 +6,9 @@ from misago.acl import version as acl_version
 from misago.admin.views import generic
 from misago.threads.threadtypes import trees_map
 
-from ..forms import CategoryFormFactory, DeleteFormFactory
-from ..models import THREADS_ROOT_NAME, Category, RoleCategoryACL
+from misago.categories import THREADS_ROOT_NAME
+from misago.categories.forms import CategoryFormFactory, DeleteFormFactory
+from misago.categories.models import Category, RoleCategoryACL
 
 
 class CategoryAdmin(generic.AdminBaseMixin):

misago/readtracker/signals.py

@@ -1,6 +1,6 @@
 from django.dispatch import Signal, receiver
 
-from misago.categories.models import PRIVATE_THREADS_ROOT_NAME
+from misago.categories import PRIVATE_THREADS_ROOT_NAME
 from misago.categories.signals import delete_category_content, move_category_content
 from misago.threads.signals import move_thread
 

misago/threads/api/postingendpoint/category.py

@@ -5,7 +5,8 @@ from django.utils.translation import ugettext_lazy
 from rest_framework import serializers
 
 from misago.acl import add_acl
-from misago.categories.models import THREADS_ROOT_NAME, Category
+from misago.categories import THREADS_ROOT_NAME
+from misago.categories.models import Category
 from misago.categories.permissions import can_browse_category, can_see_category
 
 from . import PostingEndpoint, PostingMiddleware

misago/threads/api/postingendpoint/participants.py

@@ -6,7 +6,7 @@ from django.utils.translation import ungettext
 
 from rest_framework import serializers
 
-from misago.categories.models import PRIVATE_THREADS_ROOT_NAME
+from misago.categories import PRIVATE_THREADS_ROOT_NAME
 
 from . import PostingEndpoint, PostingMiddleware
 from ...participants import add_participants, set_owner

misago/threads/api/postingendpoint/privatethread.py

@@ -1,5 +1,6 @@
 from misago.acl import add_acl
-from misago.categories.models import PRIVATE_THREADS_ROOT_NAME, Category
+from misago.categories import PRIVATE_THREADS_ROOT_NAME
+from misago.categories.models import Category
 
 from . import PostingEndpoint, PostingMiddleware
 

misago/threads/api/postingendpoint/syncprivatethreads.py

@@ -1,4 +1,4 @@
-from misago.categories.models import PRIVATE_THREADS_ROOT_NAME
+from misago.categories import PRIVATE_THREADS_ROOT_NAME
 
 from ...participants import set_users_unread_private_threads_sync
 from . import PostingEndpoint, PostingMiddleware

misago/threads/api/postingendpoint/updatestats.py

@@ -1,6 +1,6 @@
 from django.db.models import F
 
-from misago.categories.models import THREADS_ROOT_NAME
+from misago.categories import THREADS_ROOT_NAME
 
 from . import PostingEndpoint, PostingMiddleware
 

misago/threads/api/threadendpoints/editor.py

@@ -4,7 +4,8 @@ from django.utils.translation import gettext as _
 from rest_framework.response import Response
 
 from misago.acl import add_acl
-from misago.categories.models import THREADS_ROOT_NAME, Category
+from misago.categories import THREADS_ROOT_NAME
+from misago.categories.models import Category
 
 from ...permissions.threads import can_start_thread
 from ...threadtypes import trees_map

misago/threads/api/threadendpoints/merge.py

@@ -6,7 +6,8 @@ from django.utils.translation import ungettext
 from rest_framework.response import Response
 
 from misago.acl import add_acl
-from misago.categories.models import THREADS_ROOT_NAME, Category
+from misago.categories import THREADS_ROOT_NAME
+from misago.categories.models import Category
 
 from ...events import record_event
 from ...models import THREAD_WEIGHT_GLOBAL, Thread

misago/threads/api/threadendpoints/read.py

@@ -1,4 +1,5 @@
-from misago.categories.models import THREADS_ROOT_NAME, Category
+from misago.categories import THREADS_ROOT_NAME
+from misago.categories.models import Category
 from misago.categories.permissions import allow_browse_category, allow_see_category
 from misago.core.shortcuts import get_int_or_404, get_object_or_404
 from misago.readtracker.categoriestracker import read_category

misago/threads/api/threads.py

@@ -6,7 +6,7 @@ from rest_framework import viewsets
 from rest_framework.decorators import detail_route, list_route
 from rest_framework.response import Response
 
-from misago.categories.models import PRIVATE_THREADS_ROOT_NAME, THREADS_ROOT_NAME
+from misago.categories import PRIVATE_THREADS_ROOT_NAME, THREADS_ROOT_NAME
 from misago.core.shortcuts import get_int_or_404
 
 from ..models import Post, Thread

misago/threads/permissions/privatethreads.py

@@ -8,30 +8,13 @@ from django.utils.translation import ugettext_lazy as _
 from misago.acl import add_acl, algebra
 from misago.acl.decorators import return_boolean
 from misago.acl.models import Role
-from misago.categories.models import PRIVATE_THREADS_ROOT_NAME, Category
+from misago.categories import PRIVATE_THREADS_ROOT_NAME
+from misago.categories.models import Category
 from misago.core.forms import YesNoSwitch
 
 from ..models import Thread
 
 
-__all__ = [
-    'allow_use_private_threads',
-    'can_use_private_threads',
-    'allow_see_private_thread',
-    'can_see_private_thread',
-    'allow_change_owner',
-    'can_change_owner',
-    'allow_add_participants',
-    'can_add_participants',
-    'allow_remove_participant',
-    'can_remove_participant',
-    'allow_add_participant',
-    'can_add_participant',
-    'allow_message_user',
-    'can_message_user',
-]
-
-
 """
 Admin Permissions Form
 """

misago/threads/tests/test_thread_start_api.py

@@ -4,7 +4,8 @@ from __future__ import unicode_literals
 from django.urls import reverse
 
 from misago.acl.testutils import override_acl
-from misago.categories.models import THREADS_ROOT_NAME, Category
+from misago.categories import THREADS_ROOT_NAME
+from misago.categories.models import Category
 from misago.users.testutils import AuthenticatedUserTestCase
 
 from ..models import Thread

misago/threads/tests/test_threads_api.py

@@ -1,7 +1,8 @@
 from django.urls import reverse
 
 from misago.acl.testutils import override_acl
-from misago.categories.models import THREADS_ROOT_NAME, Category
+from misago.categories import THREADS_ROOT_NAME
+from misago.categories.models import Category
 from misago.users.testutils import AuthenticatedUserTestCase
 
 from .. import testutils

misago/threads/threadtypes/privatethread.py

@@ -1,7 +1,7 @@
 from django.urls import reverse
 from django.utils.translation import ugettext_lazy as _
 
-from misago.categories.models import PRIVATE_THREADS_ROOT_NAME
+from misago.categories import PRIVATE_THREADS_ROOT_NAME
 
 from . import ThreadType
 

misago/threads/threadtypes/thread.py

@@ -1,7 +1,7 @@
 from django.urls import reverse
 from django.utils.translation import ugettext_lazy as _
 
-from misago.categories.models import THREADS_ROOT_NAME
+from misago.categories import THREADS_ROOT_NAME
 
 from . import ThreadType
 

misago/threads/validators.py

@@ -2,7 +2,8 @@ from django.core.exceptions import ValidationError
 from django.utils.translation import ugettext as _
 from django.utils.translation import ungettext
 
-from misago.categories.models import THREADS_ROOT_NAME, Category
+from misago.categories import THREADS_ROOT_NAME
+from misago.categories.models import Category
 from misago.categories.permissions import can_browse_category, can_see_category
 from misago.conf import settings
 from misago.core.validators import validate_sluggable

misago/threads/viewmodels/thread.py

@@ -2,7 +2,8 @@ from django.shortcuts import get_object_or_404
 from django.utils.translation import gettext as _
 
 from misago.acl import add_acl
-from misago.categories.models import PRIVATE_THREADS_ROOT_NAME, THREADS_ROOT_NAME, Category
+from misago.categories import PRIVATE_THREADS_ROOT_NAME, THREADS_ROOT_NAME
+from misago.categories.models import Category
 from misago.core.shortcuts import validate_slug
 from misago.core.viewmodel import ViewModel as BaseViewModel
 from misago.readtracker.threadstracker import make_read_aware