Merge pull request #1158 from rafalp/remove-constants-modules

Remove constants modules, move constants to app-level init modules

misago/categories/__init__.py

@@ -1,3 +1,4 @@
-from .constants import *
-
 default_app_config = "misago.categories.apps.MisagoCategoriesConfig"
+
+PRIVATE_THREADS_ROOT_NAME = "private_threads"
+THREADS_ROOT_NAME = "root_category"

misago/categories/constants.py

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

misago/categories/models.py

@@ -12,7 +12,6 @@ from misago.threads.threadtypes import trees_map
 
 from . import PRIVATE_THREADS_ROOT_NAME, THREADS_ROOT_NAME
 
-
 CACHE_NAME = "misago_categories_tree"
 
 

misago/conftest.py

@@ -4,7 +4,7 @@ from misago.acl import ACL_CACHE, useracl
 from misago.conf import SETTINGS_CACHE
 from misago.conf.dynamicsettings import DynamicSettings
 from misago.conf.staticsettings import StaticSettings
-from misago.users.constants import BANS_CACHE
+from misago.users import BANS_CACHE
 from misago.users.models import AnonymousUser
 from misago.users.test import create_test_superuser, create_test_user
 

misago/users/__init__.py

@@ -1 +1,3 @@
 default_app_config = "misago.users.apps.MisagoUsersConfig"
+
+BANS_CACHE = "bans"

misago/users/bans.py

@@ -9,7 +9,7 @@ from datetime import timedelta
 from django.utils import timezone
 from django.utils.dateparse import parse_datetime
 
-from .constants import BANS_CACHE
+from . import BANS_CACHE
 from .models import Ban, BanCache
 
 CACHE_SESSION_KEY = "misago_ip_check"

misago/users/constants.py

@@ -1 +0,0 @@
-BANS_CACHE = "bans"

misago/users/management/commands/invalidatebans.py

@@ -3,7 +3,7 @@ from django.utils import timezone
 
 from misago.cache.versions import get_cache_versions
 
-from misago.users.constants import BANS_CACHE
+from misago.users import BANS_CACHE
 from misago.users.models import Ban, BanCache
 
 

misago/users/migrations/0017_move_bans_to_cache_version.py

@@ -1,7 +1,7 @@
 # Generated by Django 1.11.16 on 2018-11-29 20:28
 from django.db import migrations, models
 
-from misago.users.constants import BANS_CACHE
+from misago.users import BANS_CACHE
 
 
 def populate_cache_version(apps, _):

misago/users/models/ban.py

@@ -6,7 +6,7 @@ from django.utils import timezone
 from django.utils.translation import gettext_lazy as _
 
 from misago.cache.versions import invalidate_cache
-from misago.users.constants import BANS_CACHE
+from misago.users import BANS_CACHE
 
 
 class BansManager(models.Manager):

misago/users/tests/test_bans.py

@@ -13,7 +13,7 @@ from misago.users.bans import (
     get_user_ban,
     get_username_ban,
 )
-from misago.users.constants import BANS_CACHE
+from misago.users import BANS_CACHE
 from misago.users.models import Ban
 from misago.users.test import create_test_user