Commit e3bab8dc1efe143682adcff17ade513e505eacc6

Authored by Tim Graham
Committed by Claude Paroz
1 parent c8c0789b

Removed workarounds for Django 1.7

... ... @@ -56,12 +56,11 @@ class.
56 56
57 57 import datetime
58 58
59   -from django import VERSION
60 59 from django.conf import settings
61 60 from django.contrib.sites.shortcuts import get_current_site
62 61 from django.core.mail import send_mail
63 62 from django.db.models.base import ModelBase
64   -from django.template import Context, loader
  63 +from django.template import loader
65 64 from django.utils import timezone
66 65 from django.utils.translation import ugettext as _
67 66
... ... @@ -254,7 +253,7 @@ class CommentModerator(object):
254 253 'site': get_current_site(request).name,
255 254 'object': content_object,
256 255 }
257   - message = t.render(Context(c) if VERSION < (1, 8) else c)
  256 + message = t.render(c)
258 257 send_mail(subject, message, settings.DEFAULT_FROM_EMAIL, recipient_list, fail_silently=True)
259 258
260 259
... ...
1 1 from __future__ import absolute_import
2 2
3   -from django.test.utils import override_settings
  3 +from django.core.exceptions import ImproperlyConfigured
  4 +from django.test.utils import modify_settings, override_settings
4 5
5 6 import django_comments
6 7 from django_comments.models import Comment
... ... @@ -15,6 +16,12 @@ class CommentAppAPITests(CommentTestCase):
15 16 def testGetCommentApp(self):
16 17 self.assertEqual(django_comments.get_comment_app(), django_comments)
17 18
  19 + @modify_settings(INSTALLED_APPS={'remove': 'django_comments'})
  20 + def testGetMissingCommentApp(self):
  21 + msg = "The COMMENTS_APP ('django_comments') must be in INSTALLED_APPS"
  22 + with self.assertRaisesMessage(ImproperlyConfigured, msg):
  23 + django_comments.get_comment_app()
  24 +
18 25 def testGetForm(self):
19 26 self.assertEqual(django_comments.get_form(), CommentForm)
20 27
... ...
1 1 from __future__ import absolute_import
2 2
3   -import unittest
4   -
5   -from django import get_version
6 3 from django.conf import settings
7 4 from django.contrib.contenttypes.models import ContentType
8 5 from django.contrib.sites.models import Site
... ... @@ -107,8 +104,6 @@ class CommentTemplateTagTests(CommentTestCase):
107 104 self.createSomeComments()
108 105 self.verifyGetCommentList("{% get_comment_list for a as cl %}")
109 106
110   - @unittest.skipIf(get_version().startswith("1.7"),
111   - "Retrieving a site from the request is not available in Django 1.7")
112 107 def testGetCommentListUsingRequest(self, tag=None):
113 108 # A request lookup should return site_2
114 109 with override_settings(SITE_ID=self.site_2.id):
... ...
Please register or login to post a comment