Plug the signals when the apps are ready

zinnia/apps.py

@@ -10,3 +10,17 @@ class ZinniaConfig(AppConfig):
     name = 'zinnia'
     label = 'zinnia'
     verbose_name = _('Weblog')
+
+    def ready(self):
+        from django_comments.moderation import moderator
+
+        from zinnia.signals import connect_entry_signals
+        from zinnia.signals import connect_discussion_signals
+        from zinnia.moderator import EntryCommentModerator
+
+        Entry = self.get_model('Entry')
+        # Register the comment moderator on Entry
+        moderator.register(Entry, EntryCommentModerator)
+        # Connect the signals
+        connect_entry_signals()
+        connect_discussion_signals()

zinnia/models/__init__.py

@@ -1,26 +1,12 @@
 """Models for Zinnia"""
-from django_comments.moderation import moderator
-
 from zinnia.models.entry import Entry
 from zinnia.models.author import Author
 from zinnia.models.category import Category
 
-from zinnia.signals import connect_entry_signals
-from zinnia.signals import connect_discussion_signals
-
-from zinnia.moderator import EntryCommentModerator
-
 # Here we import the Zinnia's Model classes
 # to register the Models at the loading, not
 # when the Zinnia's URLs are parsed. Issue #161.
 # Issue #161, seems not valid since Django 1.7.
 __all__ = [Entry.__name__,
            Author.__name__,
            Category.__name__]
-
-# Register the comment moderator on Entry
-moderator.register(Entry, EntryCommentModerator)
-
-# Connect the signals
-connect_entry_signals()
-connect_discussion_signals()