#728: cleanup misago.users.permissions imports

misago/users/api/users.py

@@ -21,10 +21,9 @@ from misago.threads.moderation import hide_post, hide_thread
 from misago.users.bans import get_user_ban
 from misago.users.forms.options import ForumOptionsForm
 from misago.users.online.utils import get_user_status
-from misago.users.permissions.delete import allow_delete_user
-from misago.users.permissions.moderation import allow_moderate_avatar, allow_rename_user
-from misago.users.permissions.profiles import (
-    allow_browse_users_list, allow_follow_user, allow_see_ban_details)
+from misago.users.permissions import (
+    allow_browse_users_list, allow_delete_user, allow_follow_user, allow_moderate_avatar,
+    allow_rename_user, allow_see_ban_details)
 from misago.users.serializers import BanDetailsSerializer, UserSerializer
 from misago.users.viewmodels import UserPosts, UserThreads
 

misago/users/permissions/__init__.py

@@ -0,0 +1,4 @@
+from .decorators import *
+from .delete import *
+from .moderation import *
+from .profiles import *

misago/users/permissions/decorators.py

@@ -2,6 +2,12 @@ from django.core.exceptions import PermissionDenied
 from django.utils.translation import ugettext_lazy as _
 
 
+__all__ = [
+    'authenticated_only',
+    'anonymous_only',
+]
+
+
 def authenticated_only(f):
     def perm_decorator(user, target):
         if user.is_authenticated:

misago/users/permissions/delete.py

@@ -12,6 +12,12 @@ from misago.acl.decorators import return_boolean
 from misago.acl.models import Role
 
 
+__all__ = [
+    'allow_delete_user',
+    'can_delete_user',
+]
+
+
 """
 Admin Permissions Form
 """

misago/users/permissions/moderation.py

@@ -14,6 +14,20 @@ from misago.core.forms import YesNoSwitch
 from misago.users.bans import get_user_ban
 
 
+__all__ = [
+    'allow_rename_user',
+    'can_rename_user',
+    'allow_moderate_avatar',
+    'can_moderate_avatar',
+    'allow_moderate_signature',
+    'can_moderate_signature',
+    'allow_ban_user',
+    'can_ban_user',
+    'allow_lift_ban',
+    'can_lift_ban',
+]
+
+
 """
 Admin Permissions Form
 """

misago/users/permissions/profiles.py

@@ -11,6 +11,18 @@ from misago.core.forms import YesNoSwitch
 from .decorators import authenticated_only
 
 
+__all__ = [
+    'allow_browse_users_list',
+    'can_browse_users_list',
+    'allow_follow_user',
+    'can_follow_user',
+    'allow_block_user',
+    'can_block_user',
+    'allow_see_ban_details',
+    'can_see_ban_details',
+]
+
+
 """
 Admin Permissions Form
 """

misago/users/views/lists.py

@@ -9,7 +9,7 @@ from misago.core.utils import format_plaintext_for_html
 from misago.users.activepostersranking import get_active_posters_ranking
 from misago.users.models import Rank
 from misago.users.pages import users_list
-from misago.users.permissions.profiles import allow_browse_users_list
+from misago.users.permissions import allow_browse_users_list
 from misago.users.serializers import UserCardSerializer
 
 

misago/users/views/profile.py

@@ -18,7 +18,7 @@ from misago.users.bans import get_user_ban
 from misago.users.decorators import deny_guests
 from misago.users.online.utils import get_user_status
 from misago.users.pages import user_profile
-from misago.users.permissions.profiles import allow_block_user, allow_follow_user
+from misago.users.permissions import allow_block_user, allow_follow_user
 from misago.users.serializers import (
     BanDetailsSerializer, UserSerializer, UserCardSerializer, UsernameChangeSerializer)
 from misago.users.viewmodels import UserPosts, UserThreads