Merge pull request #42 from pahko/get_current_site-deprecation-warning

Prevented  get_current_site deprecation warning

+try:
+    from django.contrib.sites.shortcuts import get_current_site
+except ImportError:
+    from django.contrib.sites.models import get_current_site

 from django.contrib.syndication.views import Feed
 from django.contrib.syndication.views import Feed
-from django.contrib.sites.models import get_current_site
 from django.utils.translation import ugettext as _
 from django.utils.translation import ugettext as _
 
 
 import django_comments
 import django_comments
 
 
+from .compat import get_current_site
+
 
 
 class LatestCommentFeed(Feed):
 class LatestCommentFeed(Feed):
     """Feed of latest comments on the current site."""
     """Feed of latest comments on the current site."""

@@ -60,12 +60,13 @@ from django.conf import settings
 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 Context, loader
-from django.contrib.sites.models import get_current_site
 from django.utils import timezone
 from django.utils import timezone
 
 
 import django_comments
 import django_comments
 from django_comments import signals
 from django_comments import signals
 
 
+from .compat import get_current_site
+
 
 
 class AlreadyModerated(Exception):
 class AlreadyModerated(Exception):
     """
     """

 from django.core import urlresolvers
 from django.core import urlresolvers
-from .models import CustomComment
 from .forms import CustomCommentForm
 from .forms import CustomCommentForm
 
 
 
 
 def get_model():
 def get_model():
+    from .models import CustomComment
     return CustomComment
     return CustomComment
 
 
 
 

@@ -9,7 +9,7 @@ from django.test.utils import override_settings
 from django_comments.forms import CommentForm
 from django_comments.forms import CommentForm
 from django_comments.models import Comment
 from django_comments.models import Comment
 
 
-from ..models import Article, Author
+from testapp.models import Article, Author
 
 
 # Shortcut
 # Shortcut
 CT = ContentType.objects.get_for_model
 CT = ContentType.objects.get_for_model

@@ -8,7 +8,7 @@ from django_comments.forms import CommentForm
 from django_comments.models import Comment
 from django_comments.models import Comment
 
 
 from . import CommentTestCase
 from . import CommentTestCase
-from ..models import Article
+from testapp.models import Article
 
 
 
 
 class CommentFormTests(CommentTestCase):
 class CommentFormTests(CommentTestCase):

@@ -8,7 +8,7 @@ from django_comments.moderation import (moderator, CommentModerator,
     AlreadyModerated)
     AlreadyModerated)
 
 
 from . import CommentTestCase
 from . import CommentTestCase
-from ..models import Entry
+from testapp.models import Entry
 
 
 
 
 class EntryModerator1(CommentModerator):
 class EntryModerator1(CommentModerator):

@@ -9,7 +9,7 @@ from django_comments import signals
 from django_comments.models import Comment
 from django_comments.models import Comment
 
 
 from . import CommentTestCase
 from . import CommentTestCase
-from ..models import Article, Book
+from testapp.models import Article, Book
 
 
 
 
 post_redirect_re = re.compile(r'^http://testserver/posted/\?c=(?P<pk>\d+$)')
 post_redirect_re = re.compile(r'^http://testserver/posted/\?c=(?P<pk>\d+$)')

@@ -9,7 +9,7 @@ from django.contrib.sites.models import Site
 from django_comments.models import Comment
 from django_comments.models import Comment
 
 
 from . import CommentTestCase
 from . import CommentTestCase
-from ..models import Article
+from testapp.models import Article
 
 
 
 
 class CommentFeedTests(CommentTestCase):
 class CommentFeedTests(CommentTestCase):

@@ -3,7 +3,7 @@ from __future__ import absolute_import
 from django_comments.models import Comment
 from django_comments.models import Comment
 
 
 from . import CommentTestCase
 from . import CommentTestCase
-from ..models import Author, Article
+from testapp.models import Author, Article
 
 
 
 
 class CommentModelTests(CommentTestCase):
 class CommentModelTests(CommentTestCase):

@@ -7,7 +7,7 @@ from django.template.base import libraries
 from django_comments.forms import CommentForm
 from django_comments.forms import CommentForm
 from django_comments.models import Comment
 from django_comments.models import Comment
 
 
-from ..models import Article, Author
+from testapp.models import Article, Author
 from . import CommentTestCase
 from . import CommentTestCase
 
 
 register = Library()
 register = Library()

@@ -5,6 +5,8 @@ envlist = py26-django16, py27-django16, py32-django16, py33-django16,
 
 
 [testenv]
 [testenv]
 commands = {envpython} setup.py test
 commands = {envpython} setup.py test
+setenv=
+  PYTHONWARNINGS=default
 
 
 [testenv:py26-django16]
 [testenv:py26-django16]
 basepython = python2.6
 basepython = python2.6