switch to contrib_comments

removed in 1.8

core/bookloader.py

@@ -16,7 +16,7 @@ from urlparse import (urljoin, urlparse)
 django imports
 """
 from django.conf import settings
-from django.contrib.comments.models import Comment
+from django_comments.models import Comment
 from django.db import IntegrityError
 from django.db.models import Q
 

core/tests.py

@@ -17,7 +17,7 @@ django imports
 """
 from django.conf import settings
 from django.contrib.auth.models import User
-from django.contrib.comments.models import Comment
+from django_comments.models import Comment
 from django.contrib.contenttypes.models import ContentType
 from django.contrib.sites.models import Site
 from django.core.files import File as DjangoFile

experimental/unglueit_activity.py

@@ -1,4 +1,4 @@
-from django.contrib.comments.models import Comment
+from django_comments.models import Comment
 from regluit.experimental.gutenberg import unicode_csv
 import os
 

frontend/views.py

@@ -29,7 +29,7 @@ from django.contrib.admin.views.decorators import staff_member_required
 from django.contrib.auth.decorators import login_required
 from django.contrib.auth.models import User
 from django.contrib.auth.views import login,password_reset, redirect_to_login
-from django.contrib.comments import Comment
+from django_comments.models import Comment
 from django.contrib.sites.models import Site
 from django.core import signing
 from django.core.exceptions import ObjectDoesNotExist, ValidationError

requirements_versioned.pip

@@ -1,4 +1,4 @@
-Django==1.6.11
+Django==1.8.14
 Fabric==1.6.0
 MySQL-python==1.2.3
 Pillow==2.5.3
@@ -27,6 +27,7 @@ django-ckeditor==4.5.1
 #django-email-change==0.2.3
 git+git://github.com/eshellman/django-email-change.git@06b97124cf971dc71b9d3c4b5c4fba3c53e31e9a
 django-compat==1.0.10
+django-contrib-comments==1.7.1
 django-endless-pagination==2.0
 django-extensions==1.6.1
 django-jsonfield==0.9.10

settings/common.py

@@ -141,7 +141,7 @@ INSTALLED_APPS = (
     'django.contrib.sitemaps',
     'django.contrib.messages',
     'django.contrib.staticfiles',
-    'django.contrib.comments',
+    'django_comments',
     'django.contrib.humanize',
     'south',
     'django_extensions',

test/booktests.py

@@ -15,7 +15,7 @@ django imports
 """
 import django
 
-from django.contrib.comments.models import Comment
+from django_comments.models import Comment
 from django.db.models import Q, F
 
 """

urls.py

@@ -19,7 +19,7 @@ urlpatterns = patterns('',
     url(r'^bisac/', include('regluit.bisac.urls')),
     url(r'^selectable/', include('selectable.urls')),
     url(r'^admin/', include(admin_site.urls)), 
-    url(r'^comments/', include('django.contrib.comments.urls')),
+    url(r'^comments/', include('django_comments.urls')),
     url(r"^notification/", include('notification.urls')),
     url(r'^ckeditor/', include('ckeditor.urls')),
     # questionnaire urls