Ticket #11870: 11870_2.diff

django/contrib/comments/__init__.py

@@ -1 +1 @@
 from django.conf import settings
 from django.core import urlresolvers
 from django.core.exceptions import ImproperlyConfigured
-from django.contrib.comments.models import Comment
-from django.contrib.comments.forms import CommentForm
 from django.utils.importlib import import_module
 
 DEFAULT_COMMENTS_APP = 'django.contrib.comments'
@@ -40 +38 @@
     if get_comment_app_name() != DEFAULT_COMMENTS_APP and hasattr(get_comment_app(), "get_model"):
         return get_comment_app().get_model()
     else:
+        from django.contrib.comments.models import Comment
         return Comment
 
 def get_form():
@@ -49 +48 @@
     if get_comment_app_name() != DEFAULT_COMMENTS_APP and hasattr(get_comment_app(), "get_form"):
         return get_comment_app().get_form()
     else:
+        from django.contrib.comments.forms import CommentForm
         return CommentForm
 
 def get_form_target():

django/contrib/comments/models.py

@@ -8 +8 @@
 from django.core import urlresolvers
 from django.utils.translation import ugettext_lazy as _
 from django.conf import settings
+from django.contrib.comments import get_model
 
 COMMENT_MAX_LENGTH = getattr(settings,'COMMENT_MAX_LENGTH',3000)
 
@@ -166 +167 @@
     if you want rating look elsewhere.
     """
     user      = models.ForeignKey(User, verbose_name=_('user'), related_name="comment_flags")
-    comment   = models.ForeignKey(Comment, verbose_name=_('comment'), related_name="flags")
+    comment   = models.ForeignKey(get_model(), verbose_name=_('comment'), related_name="flags")
     flag      = models.CharField(_('flag'), max_length=30, db_index=True)
     flag_date = models.DateTimeField(_('date'), default=None)