fixes for Django 2.0 + Travis/Tox testing

.travis.yml

@@ -11,10 +11,23 @@ env:
 - PACKAGES="Django>=1.9,<1.10 django-threadedcomments>=1.1"
 - PACKAGES="Django>=1.10,<1.11"
 - PACKAGES="Django>=1.10,<1.11 django-threadedcomments>=1.1"
+- PACKAGES="Django>=1.11,<1.12"
+- PACKAGES="Django>=1.11,<1.12 django-threadedcomments>=1.1"
+- PACKAGES="Django>=2.0,<2.1"
+- PACKAGES="Django>=2.0,<2.1 django-threadedcomments>=1.1"
 - PACKAGES='https://github.com/django/django/archive/master.tar.gz'
 matrix:
+  exclude:
+  - python: '2.7'
+    env: PACKAGES="Django>=2.0,<2.1"
+  - python: '2.7'
+    env: PACKAGES="Django>=2.0,<2.1 django-threadedcomments>=1.1"
+  - python: '2.7'
+    env: PACKAGES='https://github.com/django/django/archive/master.tar.gz'
   allow_failures:
   - env: PACKAGES='https://github.com/django/django/archive/master.tar.gz'
+  - python: '3.5'
+    env: PACKAGES="Django>=2.0,<2.1 django-threadedcomments>=1.1"
 before_install:
 - pip install codecov
 install:
@@ -24,9 +37,6 @@ script:
 - coverage run example/manage.py test
 after_success:
 - codecov
-branches:
-  only:
-  - master
 notifications:
   irc:
     channels:

example/article/models.py

@@ -1,10 +1,14 @@
-from django.core.urlresolvers import reverse
 from django.db import models
 from django.utils.six import python_2_unicode_compatible
 
 from fluent_comments.moderation import moderate_model, comments_are_open, comments_are_moderated
 from fluent_comments.models import get_comments_for_model, CommentsRelation
 
+try:
+    from django.urls import reverse
+except ImportError:  # Django<2.0
+    from django.core.urlresolvers import reverse
+
 
 @python_2_unicode_compatible
 class Article(models.Model):

example/article/tests/test_comments.py

@@ -5,10 +5,14 @@
 
 from article.tests import factories
 from django.contrib.auth.models import User
-from django.core.urlresolvers import reverse
 from django.test import TestCase
 from django_comments.forms import CommentForm
 
+try:
+    from django.urls import reverse
+except ImportError:  # Django<2.0
+    from django.core.urlresolvers import reverse
+
 
 class CommentsTests(TestCase):
 

example/article/tests/test_moderation.py

@@ -1,7 +1,6 @@
 from datetime import datetime, timedelta
 
 from akismet import Akismet
-from django.core.urlresolvers import reverse
 from django.test import RequestFactory
 from django.test import TestCase
 from django.utils.timezone import now
@@ -13,6 +12,11 @@
 from article.tests import factories
 from .utils import override_appsettings
 
+try:
+    from django.urls import reverse
+except ImportError:  # Django<2.0
+    from django.core.urlresolvers import reverse
+
 
 class MockedResponse(object):
     def __init__(self, result):

example/settings.py

@@ -61,13 +61,14 @@
 ]
 
 
-MIDDLEWARE_CLASSES = (
+MIDDLEWARE = (
     'django.middleware.common.CommonMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.middleware.csrf.CsrfViewMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
 )
+MIDDLEWARE_CLASSES = MIDDLEWARE
 
 TEST_RUNNER = 'django.test.runner.DiscoverRunner'
 

example/urls.py

@@ -7,7 +7,7 @@
 admin.autodiscover()
 
 urlpatterns = [
-    url(r'^admin/', include(admin.site.urls)),
+    url(r'^admin/', admin.site.urls),
 
     url(r'^comments/', include(fluent_comments.urls)),
     url(r'^articles/', include(article.urls)),

fluent_comments/views.py

@@ -36,7 +36,7 @@ def post_comment_ajax(request, using=None):
 
     # Fill out some initial data fields from an authenticated user, if present
     data = request.POST.copy()
-    if request.user.is_authenticated():
+    if request.user.is_authenticated is True:
         if not data.get('name', ''):
             data["name"] = request.user.get_full_name() or request.user.username
         if not data.get('email', ''):
@@ -81,7 +81,7 @@ def post_comment_ajax(request, using=None):
     # Otherwise create the comment
     comment = form.get_comment_object()
     comment.ip_address = request.META.get("REMOTE_ADDR", None)
-    if request.user.is_authenticated():
+    if request.user.is_authenticated is True:
         comment.user = request.user
 
     # Signal that the comment is about to be saved

tox.ini

@@ -1,8 +1,8 @@
 [tox]
 envlist=
-    py27-django{18,19,110,111},
+    py27-django{18,19,110,111,20},
     py33-django{18},
-    py34-django{18,19,110,111},
+    py34-django{18,19,110,111,20},
     py34-django{110}-tc,
     # py33-django-dev,
     docs,
@@ -13,7 +13,9 @@ deps =
     django19: Django >= 1.9,<1.10
     django110: Django >= 1.10,<1.11
     django111: Django >= 1.11,<1.12
+    django20: Django >= 2.0,<2.1
     tc: django-threadedcomments >= 1.1
     django-dev: https://github.com/django/django/tarball/master
+    mock
 commands=
     ./runtests.sh