Merge pull request #66 from jaddison/master

General improvements

 from importlib import import_module
 from importlib import import_module
 
 
+from django.apps import apps
 from django.conf import settings
 from django.conf import settings
 from django.core import urlresolvers
 from django.core import urlresolvers
 from django.core.exceptions import ImproperlyConfigured
 from django.core.exceptions import ImproperlyConfigured
@@ -14,9 +15,9 @@ def get_comment_app():
     """
     """
     # Make sure the app's in INSTALLED_APPS
     # Make sure the app's in INSTALLED_APPS
     comments_app = get_comment_app_name()
     comments_app = get_comment_app_name()
-    if comments_app not in settings.INSTALLED_APPS:
+    if not apps.is_installed(comments_app):
         raise ImproperlyConfigured(
         raise ImproperlyConfigured(
-            "The COMMENTS_APP (%r) must be in INSTALLED_APPS" % settings.COMMENTS_APP
+            "The COMMENTS_APP (%r) must be in INSTALLED_APPS" % comments_app
         )
         )
 
 
     # Try to import the package
     # Try to import the package

@@ -9,7 +9,8 @@ from django.utils.encoding import force_text
 from django.utils.text import get_text_list
 from django.utils.text import get_text_list
 from django.utils import timezone
 from django.utils import timezone
 from django.utils.translation import pgettext_lazy, ungettext, ugettext, ugettext_lazy as _
 from django.utils.translation import pgettext_lazy, ungettext, ugettext, ugettext_lazy as _
-from django_comments.models import Comment
+
+from . import get_model
 
 
 COMMENT_MAX_LENGTH = getattr(settings, 'COMMENT_MAX_LENGTH', 3000)
 COMMENT_MAX_LENGTH = getattr(settings, 'COMMENT_MAX_LENGTH', 3000)
 DEFAULT_COMMENTS_TIMEOUT = getattr(settings, 'COMMENTS_TIMEOUT', (2 * 60 * 60))  # 2h
 DEFAULT_COMMENTS_TIMEOUT = getattr(settings, 'COMMENTS_TIMEOUT', (2 * 60 * 60))  # 2h
@@ -127,7 +128,7 @@ class CommentDetailsForm(CommentSecurityForm):
         comment apps should override this, get_comment_create_data, and perhaps
         comment apps should override this, get_comment_create_data, and perhaps
         check_for_duplicate_comment to provide custom comment models.
         check_for_duplicate_comment to provide custom comment models.
         """
         """
-        return Comment
+        return get_model()
 
 
     def get_comment_create_data(self):
     def get_comment_create_data(self):
         """
         """

@@ -43,7 +43,7 @@ class BaseCommentAbstractModel(models.Model):
 
 
 
 
 @python_2_unicode_compatible
 @python_2_unicode_compatible
-class Comment(BaseCommentAbstractModel):
+class CommentAbstractModel(BaseCommentAbstractModel):
     """
     """
     A user comment about some object.
     A user comment about some object.
     """
     """
@@ -76,7 +76,7 @@ class Comment(BaseCommentAbstractModel):
     objects = CommentManager()
     objects = CommentManager()
 
 
     class Meta:
     class Meta:
-        db_table = "django_comments"
+        abstract = True
         ordering = ('submit_date',)
         ordering = ('submit_date',)
         permissions = [("can_moderate", "Can moderate comments")]
         permissions = [("can_moderate", "Can moderate comments")]
         verbose_name = _('comment')
         verbose_name = _('comment')
@@ -88,7 +88,7 @@ class Comment(BaseCommentAbstractModel):
     def save(self, *args, **kwargs):
     def save(self, *args, **kwargs):
         if self.submit_date is None:
         if self.submit_date is None:
             self.submit_date = timezone.now()
             self.submit_date = timezone.now()
-        super(Comment, self).save(*args, **kwargs)
+        super(CommentAbstractModel, self).save(*args, **kwargs)
 
 
     def _get_userinfo(self):
     def _get_userinfo(self):
         """
         """
@@ -167,6 +167,11 @@ class Comment(BaseCommentAbstractModel):
         return _('Posted by %(user)s at %(date)s\n\n%(comment)s\n\nhttp://%(domain)s%(url)s') % d
         return _('Posted by %(user)s at %(date)s\n\n%(comment)s\n\nhttp://%(domain)s%(url)s') % d
 
 
 
 
+class Comment(CommentAbstractModel):
+    class Meta(CommentAbstractModel.Meta):
+        db_table = "django_comments"
+
+
 @python_2_unicode_compatible
 @python_2_unicode_compatible
 class CommentFlag(models.Model):
 class CommentFlag(models.Model):
     """
     """

@@ -61,21 +61,20 @@ the ``my_comment_app`` directory::
 In the ``models.py`` we'll define a ``CommentWithTitle`` model::
 In the ``models.py`` we'll define a ``CommentWithTitle`` model::
 
 
     from django.db import models
     from django.db import models
-    from django_comments.models import Comment
+    from django_comments.models import CommentAbstractModel
 
 
-    class CommentWithTitle(Comment):
+    class CommentWithTitle(CommentAbstractModel):
         title = models.CharField(max_length=300)
         title = models.CharField(max_length=300)
 
 
 Most custom comment models will subclass the
 Most custom comment models will subclass the
-:class:`~django_comments.models.Comment` model. However,
+:class:`~django_comments.models.CommentAbstractModel` model. However,
 if you want to substantially remove or change the fields available in the
 if you want to substantially remove or change the fields available in the
-:class:`~django_comments.models.Comment` model, but don't want to
+:class:`~django_comments.models.CommentAbstractModel` model, but don't want to
 rewrite the templates, you could try subclassing from
 rewrite the templates, you could try subclassing from
 ``BaseCommentAbstractModel``.
 ``BaseCommentAbstractModel``.
 
 
 Next, we'll define a custom comment form in ``forms.py``. This is a little more
 Next, we'll define a custom comment form in ``forms.py``. This is a little more
 tricky: we have to both create a form and override
 tricky: we have to both create a form and override
-``CommentForm.get_comment_model()`` and
 ``CommentForm.get_comment_create_data()`` to return deal with our custom title
 ``CommentForm.get_comment_create_data()`` to return deal with our custom title
 field::
 field::
 
 
@@ -86,10 +85,6 @@ field::
     class CommentFormWithTitle(CommentForm):
     class CommentFormWithTitle(CommentForm):
         title = forms.CharField(max_length=300)
         title = forms.CharField(max_length=300)
 
 
-        def get_comment_model(self):
-            # Use our custom comment model instead of the default one.
-            return CommentWithTitle
-
         def get_comment_create_data(self):
         def get_comment_create_data(self):
             # Use the data of the superclass, and add in the title field
             # Use the data of the superclass, and add in the title field
             data = super(CommentFormWithTitle, self).get_comment_create_data()
             data = super(CommentFormWithTitle, self).get_comment_create_data()