Added compatibility with latest Django master

@@ -2,8 +2,11 @@ from importlib import import_module
 
 
 from django.apps import apps
 from django.apps import apps
 from django.conf import settings
 from django.conf import settings
-from django.core import urlresolvers
 from django.core.exceptions import ImproperlyConfigured
 from django.core.exceptions import ImproperlyConfigured
+try:
+    from django.urls import reverse
+except ImportError:
+    from django.core.urlresolvers import reverse  # Django < 1.10
 
 
 
 
 DEFAULT_COMMENTS_APP = 'django_comments'
 DEFAULT_COMMENTS_APP = 'django_comments'
@@ -68,7 +71,7 @@ def get_form_target():
     if get_comment_app_name() != DEFAULT_COMMENTS_APP and hasattr(get_comment_app(), "get_form_target"):
     if get_comment_app_name() != DEFAULT_COMMENTS_APP and hasattr(get_comment_app(), "get_form_target"):
         return get_comment_app().get_form_target()
         return get_comment_app().get_form_target()
     else:
     else:
-        return urlresolvers.reverse("comments-post-comment")
+        return reverse("comments-post-comment")
 
 
 
 
 def get_flag_url(comment):
 def get_flag_url(comment):
@@ -78,7 +81,7 @@ def get_flag_url(comment):
     if get_comment_app_name() != DEFAULT_COMMENTS_APP and hasattr(get_comment_app(), "get_flag_url"):
     if get_comment_app_name() != DEFAULT_COMMENTS_APP and hasattr(get_comment_app(), "get_flag_url"):
         return get_comment_app().get_flag_url(comment)
         return get_comment_app().get_flag_url(comment)
     else:
     else:
-        return urlresolvers.reverse("comments-flag", args=(comment.id,))
+        return reverse("comments-flag", args=(comment.id,))
 
 
 
 
 def get_delete_url(comment):
 def get_delete_url(comment):
@@ -88,7 +91,7 @@ def get_delete_url(comment):
     if get_comment_app_name() != DEFAULT_COMMENTS_APP and hasattr(get_comment_app(), "get_delete_url"):
     if get_comment_app_name() != DEFAULT_COMMENTS_APP and hasattr(get_comment_app(), "get_delete_url"):
         return get_comment_app().get_delete_url(comment)
         return get_comment_app().get_delete_url(comment)
     else:
     else:
-        return urlresolvers.reverse("comments-delete", args=(comment.id,))
+        return reverse("comments-delete", args=(comment.id,))
 
 
 
 
 def get_approve_url(comment):
 def get_approve_url(comment):
@@ -98,4 +101,4 @@ def get_approve_url(comment):
     if get_comment_app_name() != DEFAULT_COMMENTS_APP and hasattr(get_comment_app(), "get_approve_url"):
     if get_comment_app_name() != DEFAULT_COMMENTS_APP and hasattr(get_comment_app(), "get_approve_url"):
         return get_comment_app().get_approve_url(comment)
         return get_comment_app().get_approve_url(comment)
     else:
     else:
-        return urlresolvers.reverse("comments-approve", args=(comment.id,))
+        return reverse("comments-approve", args=(comment.id,))

@@ -4,11 +4,14 @@ from django.conf import settings
 from django.contrib.contenttypes.fields import GenericForeignKey
 from django.contrib.contenttypes.fields import GenericForeignKey
 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
-from django.core import urlresolvers
 from django.db import models
 from django.db import models
 from django.utils import timezone
 from django.utils import timezone
 from django.utils.encoding import python_2_unicode_compatible
 from django.utils.encoding import python_2_unicode_compatible
 from django.utils.translation import ugettext_lazy as _
 from django.utils.translation import ugettext_lazy as _
+try:
+    from django.urls import reverse
+except ImportError:
+    from django.core.urlresolvers import reverse  # Django < 1.10
 
 
 from .managers import CommentManager
 from .managers import CommentManager
 
 
@@ -39,7 +42,7 @@ class BaseCommentAbstractModel(models.Model):
         """
         """
         Get a URL suitable for redirecting to the content object.
         Get a URL suitable for redirecting to the content object.
         """
         """
-        return urlresolvers.reverse(
+        return reverse(
             "comments-url-redirect",
             "comments-url-redirect",
             args=(self.content_type_id, self.object_pk)
             args=(self.content_type_id, self.object_pk)
         )
         )

@@ -40,7 +40,11 @@ def post_comment(request, next=None, using=None):
     """
     """
     # Fill out some initial data fields from an authenticated user, if present
     # Fill out some initial data fields from an authenticated user, if present
     data = request.POST.copy()
     data = request.POST.copy()
-    if request.user.is_authenticated():
+    try:
+        user_is_authenticated = request.user.is_authenticated()
+    except TypeError:  # Django >= 1.11
+        user_is_authenticated = request.user.is_authenticated
+    if user_is_authenticated:
         if not data.get('name', ''):
         if not data.get('name', ''):
             data["name"] = request.user.get_full_name() or request.user.get_username()
             data["name"] = request.user.get_full_name() or request.user.get_username()
         if not data.get('email', ''):
         if not data.get('email', ''):
@@ -103,7 +107,7 @@ def post_comment(request, next=None, using=None):
     # Otherwise create the comment
     # Otherwise create the comment
     comment = form.get_comment_object(site_id=get_current_site(request).id)
     comment = form.get_comment_object(site_id=get_current_site(request).id)
     comment.ip_address = request.META.get("REMOTE_ADDR", None)
     comment.ip_address = request.META.get("REMOTE_ADDR", None)
-    if request.user.is_authenticated():
+    if user_is_authenticated:
         comment.user = request.user
         comment.user = request.user
 
 
     # Signal that the comment is about to be saved
     # Signal that the comment is about to be saved

-from django.core import urlresolvers
+try:
+    from django.urls import reverse
+except ImportError:
+    from django.core.urlresolvers import reverse  # Django < 1.10
 
 
 from . import views
 from . import views
 from .forms import CustomCommentForm
 from .forms import CustomCommentForm
@@ -14,16 +17,16 @@ def get_form():
 
 
 
 
 def get_form_target():
 def get_form_target():
-    return urlresolvers.reverse(views.custom_submit_comment)
+    return reverse(views.custom_submit_comment)
 
 
 
 
 def get_flag_url(c):
 def get_flag_url(c):
-    return urlresolvers.reverse(views.custom_flag_comment, args=(c.id,))
+    return reverse(views.custom_flag_comment, args=(c.id,))
 
 
 
 
 def get_delete_url(c):
 def get_delete_url(c):
-    return urlresolvers.reverse(views.custom_delete_comment, args=(c.id,))
+    return reverse(views.custom_delete_comment, args=(c.id,))
 
 
 
 
 def get_approve_url(c):
 def get_approve_url(c):
-    return urlresolvers.reverse(views.custom_approve_comment, args=(c.id,))
+    return reverse(views.custom_approve_comment, args=(c.id,))

@@ -25,11 +25,16 @@ settings.configure(
         "testapp",
         "testapp",
         "custom_comments",
         "custom_comments",
     ],
     ],
-    MIDDLEWARE_CLASSES=(
+    MIDDLEWARE=(
         'django.contrib.sessions.middleware.SessionMiddleware',
         'django.contrib.sessions.middleware.SessionMiddleware',
         'django.contrib.auth.middleware.AuthenticationMiddleware',
         'django.contrib.auth.middleware.AuthenticationMiddleware',
         'django.contrib.messages.middleware.MessageMiddleware',
         'django.contrib.messages.middleware.MessageMiddleware',
     ),
     ),
+    MIDDLEWARE_CLASSES=(
+        'django.contrib.sessions.middleware.SessionMiddleware',
+        'django.contrib.auth.middleware.AuthenticationMiddleware',
+        'django.contrib.messages.middleware.MessageMiddleware',
+    ),  # Django < 1.10
     ROOT_URLCONF='testapp.urls',
     ROOT_URLCONF='testapp.urls',
     TEMPLATES=[
     TEMPLATES=[
         {
         {

-from django.conf.urls import include, url
+from django.conf.urls import url
 from django.contrib import admin
 from django.contrib import admin
 from django_comments.admin import CommentsAdmin
 from django_comments.admin import CommentsAdmin
 from django_comments.models import Comment
 from django_comments.models import Comment
@@ -14,6 +14,6 @@ admin_site2.disable_action('delete_selected')
 admin_site2.register(Comment, CommentsAdmin)
 admin_site2.register(Comment, CommentsAdmin)
 
 
 urlpatterns = [
 urlpatterns = [
-    url(r'^admin/', include(admin_site.urls)),
-    url(r'^admin2/', include(admin_site2.urls)),
+    url(r'^admin/', admin_site.urls),
+    url(r'^admin2/', admin_site2.urls),
 ]
 ]