Merged signals to one file, moved over models, fixed import crash in forms

misago/core/forms/__init__.py

@@ -1,4 +1,4 @@
-from misago.core.forms.fields import ForumChoiceField
+from misago.core.forms.fields import ForumChoiceField, ReCaptchaField, QACaptchaField
 from misago.core.forms.forms import Form
 from misago.core.forms.layouts import FormLayout, FormFields, FormFieldsets
 from misago.core.forms.widgets import ReCaptchaWidget, YesNoSwitch

misago/core/forms/fields.py

@@ -1,7 +1,8 @@
 from mptt.forms import TreeNodeChoiceField
+from django.forms import fields
 from django.utils.html import conditional_escape, mark_safe
 from django.utils.translation import ugettext_lazy as _
-from misago.core.forms import ReCaptchaWidget
+from misago.core.forms.widgets import ReCaptchaWidget
 
 class ForumChoiceField(TreeNodeChoiceField):
     """
@@ -16,7 +17,7 @@ class ForumChoiceField(TreeNodeChoiceField):
         return mark_safe(conditional_escape(self.level_indicator) * (level - 1))
 
 
-class ReCaptchaField(CharField):
+class ReCaptchaField(fields.CharField):
     widget = ReCaptchaWidget
     api_error = None
     def __init__(self, label=_("Verification Code"), *args, **kwargs):
@@ -24,5 +25,5 @@ class ReCaptchaField(CharField):
         super(ReCaptchaField, self).__init__(*args, **kwargs)
 
 
-class QACaptchaField(CharField):
+class QACaptchaField(fields.CharField):
     pass

misago/models/__init__.py

@@ -10,7 +10,7 @@ from misago.models.karmamodel import Karma
 from misago.models.monitoritemmodel import MonitorItem
 from misago.models.newslettermodel import Newsletter
 from misago.models.postmodel import Post
-from misago.models.prunepolicymodel import PrunePolicy
+from misago.models.pruningpolicymodel import PruningPolicy
 from misago.models.rankmodel import Rank
 from misago.models.rolemodel import Role
 from misago.models.sessionmodel import Session

misago/models/changemodel.py

@@ -1,7 +1,6 @@
 from django.db import models
-from misago.forums.signals import move_forum_content
-from misago.threads.signals import move_thread, merge_thread, move_post, merge_post
-from misago.users.signals import rename_user
+from misago.signals import (merge_post, merge_thread, move_forum_content,
+                            move_post, move_thread, rename_user)
 
 class Change(models.Model):
     forum = models.ForeignKey('Forum')

misago/models/checkpointmodel.py

@@ -1,7 +1,6 @@
 from django.db import models
-from misago.forums.signals import move_forum_content
-from misago.threads.signals import move_thread, merge_thread, move_post, merge_post
-from misago.users.signals import rename_user
+from misago.signals import (merge_post, merge_thread, move_forum_content,
+                            move_post, move_thread, rename_user)
 
 class Checkpoint(models.Model):
     forum = models.ForeignKey('Forum')

misago/models/forummodel.py

@@ -3,8 +3,7 @@ from django.conf import settings
 from django.core.cache import cache
 from django.db import models
 from django.utils.translation import ugettext_lazy as _
-from misago.forums.signals import move_forum_content, delete_forum_content
-from misago.users.signals import rename_user
+from misago.signals import delete_forum_content, move_forum_content, rename_user
 
 class ForumManager(models.Manager):
     forums_tree = None

misago/models/forumreadmodel.py

@@ -2,8 +2,7 @@ from datetime import timedelta
 from django.conf import settings
 from django.db import models
 from django.utils import timezone
-from misago.forums.signals import move_forum_content
-from misago.threads.signals import move_thread
+from misago.signals import move_forum_content
 
 class ForumRead(models.Model):
     user = models.ForeignKey('User')

misago/models/karmamodel.py

@@ -1,7 +1,6 @@
 from django.db import models
-from misago.forums.signals import move_forum_content
-from misago.threads.signals import move_thread, merge_thread, move_post, merge_post
-from misago.users.signals import rename_user
+from misago.signals import (merge_post, merge_thread, move_forum_content,
+                            move_post, move_thread, rename_user)
 
 class Karma(models.Model):
     forum = models.ForeignKey('Forum')

misago/models/newslettermodel.py

@@ -1,5 +1,5 @@
 from django.db import models
-from misago.utils.string import random_string
+from misago.utils.strings import random_string
 
 class Newsletter(models.Model):
     name = models.CharField(max_length=255)

misago/models/postmodel.py

@@ -2,9 +2,8 @@ from django.db import models
 from django.db.models import F
 from django.utils import timezone
 from django.utils.translation import ugettext_lazy as _
-from misago.forums.signals import move_forum_content
-from misago.threads.signals import move_thread, merge_thread, move_post, merge_post
-from misago.users.signals import delete_user_content, rename_user
+from misago.signals import (delete_user_content, merge_post, merge_thread,
+                            move_forum_content, move_post, move_thread, rename_user)
 
 class PostManager(models.Manager):
     def filter_stats(self, start, end):

misago/models/threadmodel.py

@@ -3,9 +3,8 @@ from django.conf import settings
 from django.db import models
 from django.utils import timezone
 from django.utils.translation import ugettext_lazy as _
-from misago.forums.signals import move_forum_content
-from misago.threads.signals import move_thread, merge_thread
-from misago.users.signals import delete_user_content, rename_user
+from misago.signals import (delete_user_content, merge_thread, move_forum_content,
+                            move_thread, rename_user)
 from misago.utils.strings import slugify
 
 class ThreadManager(models.Manager):

misago/models/threadreadmodel.py

@@ -1,8 +1,7 @@
 from django.db import models
-from misago.forums.signals import move_forum_content
-from misago.threads.signals import move_thread
+from misago.signals import move_forum_content, move_thread
 
-class ThreadRecord(models.Model):
+class ThreadRead(models.Model):
     user = models.ForeignKey('User')
     forum = models.ForeignKey('Forum')
     thread = models.ForeignKey('Thread')
@@ -13,12 +12,12 @@ class ThreadRecord(models.Model):
 
 
 def move_forum_content_handler(sender, **kwargs):
-    ThreadRecord.objects.filter(forum=sender).update(forum=kwargs['move_to'])
+    ThreadRead.objects.filter(forum=sender).update(forum=kwargs['move_to'])
 
 move_forum_content.connect(move_forum_content_handler, dispatch_uid="move_forum_threads_reads")
 
 
 def move_thread_handler(sender, **kwargs):
-    ThreadRecord.objects.filter(thread=sender).delete()
+    ThreadRead.objects.filter(thread=sender).delete()
 
 move_thread.connect(move_thread_handler, dispatch_uid="move_thread_reads")

misago/models/usermodel.py

@@ -15,7 +15,7 @@ from django.utils.translation import ugettext_lazy as _
 from misago.acl.builder import build_acl
 from misago.monitor.monitor import Monitor
 from misago.core.settings import DBSettings
-from misago.users.signals import delete_user_content, rename_user
+from misago.signals import delete_user_content, rename_user
 from misago.users.validators import validate_username, validate_password, validate_email
 from misago.utils.strings import random_string, slugify
 from misago.utils.avatars import avatar_size

misago/models/watchedthreadmodel.py

@@ -1,6 +1,6 @@
 from django.db import models
-from misago.forums.signals import move_forum_content
-from misago.threads.signals import move_thread, merge_thread
+from misago.forums.signals import 
+from misago.signals import merge_thread, move_forum_content, move_thread
 
 class WatchedThread(models.Model):
     user = models.ForeignKey('User')

misago/signals.py

@@ -0,0 +1,10 @@
+import django.dispatch
+
+delete_forum_content = django.dispatch.Signal()
+delete_user_content = django.dispatch.Signal()
+merge_post = django.dispatch.Signal(providing_args=["new_post"])
+merge_thread = django.dispatch.Signal(providing_args=["new_thread", "merge"])
+move_forum_content = django.dispatch.Signal(providing_args=["move_to"])
+move_post = django.dispatch.Signal(providing_args=["move_to"])
+move_thread = django.dispatch.Signal(providing_args=["move_to"])
+rename_user = django.dispatch.Signal()