Removed workarounds for Django 1.7

@@ -56,12 +56,11 @@ class.
 
 
 import datetime
 import datetime
 
 
-from django import VERSION
 from django.conf import settings
 from django.conf import settings
 from django.contrib.sites.shortcuts import get_current_site
 from django.contrib.sites.shortcuts import get_current_site
 from django.core.mail import send_mail
 from django.core.mail import send_mail
 from django.db.models.base import ModelBase
 from django.db.models.base import ModelBase
-from django.template import Context, loader
+from django.template import loader
 from django.utils import timezone
 from django.utils import timezone
 from django.utils.translation import ugettext as _
 from django.utils.translation import ugettext as _
 
 
@@ -254,7 +253,7 @@ class CommentModerator(object):
             'site': get_current_site(request).name,
             'site': get_current_site(request).name,
             'object': content_object,
             'object': content_object,
         }
         }
-        message = t.render(Context(c) if VERSION < (1, 8) else c)
+        message = t.render(c)
         send_mail(subject, message, settings.DEFAULT_FROM_EMAIL, recipient_list, fail_silently=True)
         send_mail(subject, message, settings.DEFAULT_FROM_EMAIL, recipient_list, fail_silently=True)
 
 
 
 

 from __future__ import absolute_import
 from __future__ import absolute_import
 
 
-from django.test.utils import override_settings
+from django.core.exceptions import ImproperlyConfigured
+from django.test.utils import modify_settings, override_settings
 
 
 import django_comments
 import django_comments
 from django_comments.models import Comment
 from django_comments.models import Comment
@@ -15,6 +16,12 @@ class CommentAppAPITests(CommentTestCase):
     def testGetCommentApp(self):
     def testGetCommentApp(self):
         self.assertEqual(django_comments.get_comment_app(), django_comments)
         self.assertEqual(django_comments.get_comment_app(), django_comments)
 
 
+    @modify_settings(INSTALLED_APPS={'remove': 'django_comments'})
+    def testGetMissingCommentApp(self):
+        msg = "The COMMENTS_APP ('django_comments') must be in INSTALLED_APPS"
+        with self.assertRaisesMessage(ImproperlyConfigured, msg):
+            django_comments.get_comment_app()
+
     def testGetForm(self):
     def testGetForm(self):
         self.assertEqual(django_comments.get_form(), CommentForm)
         self.assertEqual(django_comments.get_form(), CommentForm)
 
 

 from __future__ import absolute_import
 from __future__ import absolute_import
 
 
-import unittest
-
-from django import get_version
 from django.conf import settings
 from django.conf import settings
 from django.contrib.contenttypes.models import ContentType
 from django.contrib.contenttypes.models import ContentType
 from django.contrib.sites.models import Site
 from django.contrib.sites.models import Site
@@ -107,8 +104,6 @@ class CommentTemplateTagTests(CommentTestCase):
         self.createSomeComments()
         self.createSomeComments()
         self.verifyGetCommentList("{% get_comment_list for a as cl %}")
         self.verifyGetCommentList("{% get_comment_list for a as cl %}")
 
 
-    @unittest.skipIf(get_version().startswith("1.7"),
-                    "Retrieving a site from the request is not available in Django 1.7")
     def testGetCommentListUsingRequest(self, tag=None):
     def testGetCommentListUsingRequest(self, tag=None):
         # A request lookup should return site_2
         # A request lookup should return site_2
         with override_settings(SITE_ID=self.site_2.id):
         with override_settings(SITE_ID=self.site_2.id):