Commit fe7a8e7ea395e34a6a962591c75eb5e71e52e570
1 parent
45347d0a
Prevented get_current_site deprecation warning
Showing
12 changed files
with
18 additions
and
10 deletions
django_comments/compat.py
0 → 100644
| 1 | 1 | from django.contrib.syndication.views import Feed |
| 2 | -from django.contrib.sites.models import get_current_site | |
| 3 | 2 | from django.utils.translation import ugettext as _ |
| 4 | 3 | |
| 5 | 4 | import django_comments |
| 6 | 5 | |
| 6 | +from .compat import get_current_site | |
| 7 | + | |
| 7 | 8 | |
| 8 | 9 | class LatestCommentFeed(Feed): |
| 9 | 10 | """Feed of latest comments on the current site.""" | ... | ... |
| ... | ... | @@ -60,12 +60,13 @@ from django.conf import settings |
| 60 | 60 | from django.core.mail import send_mail |
| 61 | 61 | from django.db.models.base import ModelBase |
| 62 | 62 | from django.template import Context, loader |
| 63 | -from django.contrib.sites.models import get_current_site | |
| 64 | 63 | from django.utils import timezone |
| 65 | 64 | |
| 66 | 65 | import django_comments |
| 67 | 66 | from django_comments import signals |
| 68 | 67 | |
| 68 | +from .compat import get_current_site | |
| 69 | + | |
| 69 | 70 | |
| 70 | 71 | class AlreadyModerated(Exception): |
| 71 | 72 | """ | ... | ... |
| ... | ... | @@ -9,7 +9,7 @@ from django.test.utils import override_settings |
| 9 | 9 | from django_comments.forms import CommentForm |
| 10 | 10 | from django_comments.models import Comment |
| 11 | 11 | |
| 12 | -from ..models import Article, Author | |
| 12 | +from testapp.models import Article, Author | |
| 13 | 13 | |
| 14 | 14 | # Shortcut |
| 15 | 15 | CT = ContentType.objects.get_for_model | ... | ... |
| ... | ... | @@ -9,7 +9,7 @@ from django_comments import signals |
| 9 | 9 | from django_comments.models import Comment |
| 10 | 10 | |
| 11 | 11 | from . import CommentTestCase |
| 12 | -from ..models import Article, Book | |
| 12 | +from testapp.models import Article, Book | |
| 13 | 13 | |
| 14 | 14 | |
| 15 | 15 | post_redirect_re = re.compile(r'^http://testserver/posted/\?c=(?P<pk>\d+$)') | ... | ... |
| ... | ... | @@ -7,7 +7,7 @@ from django.template.base import libraries |
| 7 | 7 | from django_comments.forms import CommentForm |
| 8 | 8 | from django_comments.models import Comment |
| 9 | 9 | |
| 10 | -from ..models import Article, Author | |
| 10 | +from testapp.models import Article, Author | |
| 11 | 11 | from . import CommentTestCase |
| 12 | 12 | |
| 13 | 13 | register = Library() | ... | ... |
Please
register
or
login
to post a comment