Index: django/contrib/comments/__init__.py =================================================================== --- django/contrib/comments/__init__.py (Revision 12996) +++ django/contrib/comments/__init__.py (Arbeitskopie) @@ -1,7 +1,6 @@ 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 @@ -40,6 +39,7 @@ 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(): Index: django/contrib/comments/forms.py =================================================================== --- django/contrib/comments/forms.py (Revision 12996) +++ django/contrib/comments/forms.py (Arbeitskopie) @@ -5,7 +5,6 @@ from django.forms.util import ErrorDict from django.conf import settings from django.contrib.contenttypes.models import ContentType -from models import Comment from django.utils.encoding import force_unicode from django.utils.hashcompat import sha_constructor from django.utils.text import get_text_list @@ -120,6 +119,7 @@ comment apps should override this, get_comment_create_data, and perhaps check_for_duplicate_comment to provide custom comment models. """ + from models import Comment return Comment def get_comment_create_data(self):