Merge pull request django-ckeditor#452 from ahumeau/master

Django 2.0 compatibility

Author: matthiask

ckeditor_demo/demo_application/tests.py

@@ -9,6 +9,7 @@
 from django.contrib.staticfiles.finders import find
 from django.contrib.staticfiles.testing import StaticLiveServerTestCase
 from django.test.utils import override_settings
+
 from selenium import webdriver
 
 CHROMIUM = 'chromium'
@@ -22,7 +23,7 @@ class TestAdminPanelWidget(StaticLiveServerTestCase):
     @classmethod
     def setUpClass(cls):
         if SELENIUM_BROWSER == CHROMIUM:
-            cls.selenium = webdriver.Chrome(executable_path='/usr/lib/chromium-browser/chromedriver')
+            cls.selenium = webdriver.Chrome(executable_path='chromedriver')
         elif SELENIUM_BROWSER == FIREFOX:
             cls.selenium = webdriver.Firefox()
         super(TestAdminPanelWidget, cls).setUpClass()

ckeditor_demo/demo_application/views.py

@@ -1,10 +1,14 @@
 from __future__ import absolute_import
 
-from django.core.urlresolvers import reverse
 from django.views import generic
 
 from . import forms
 
+try:
+    from django.urls import reverse
+except ImportError:  # Django < 2.0
+    from django.core.urlresolvers import reverse
+
 
 class CkEditorFormView(generic.FormView):
     form_class = forms.CkEditorForm

ckeditor_demo/settings.py

@@ -77,14 +77,18 @@
     'ckeditor_demo.demo_application',
 )
 
-MIDDLEWARE_CLASSES = (
+_MIDDLEWARE = (
     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.middleware.common.CommonMiddleware',
     'django.middleware.csrf.CsrfViewMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
     'django.middleware.clickjacking.XFrameOptionsMiddleware',
 )
+if django.VERSION >= (1, 10):
+    MIDDLEWARE = _MIDDLEWARE
+else:
+    MIDDLEWARE_CLASSES = _MIDDLEWARE
 
 ROOT_URLCONF = 'ckeditor_demo.urls'
 

ckeditor_demo/urls.py

@@ -12,7 +12,7 @@
 if django.VERSION >= (1, 8):
     urlpatterns = [
         url(r'^$', ckeditor_form_view, name='ckeditor-form'),
-        url(r'^admin/', include(admin.site.urls)),
+        url(r'^admin/', admin.site.urls),
         url(r'^ckeditor/', include('ckeditor_uploader.urls')),
     ] + static(
         settings.STATIC_URL,

ckeditor_uploader/image/pillow_backend.py

@@ -11,7 +11,6 @@
 
 from ckeditor_uploader import utils
 
-
 THUMBNAIL_SIZE = getattr(settings, "THUMBNAIL_SIZE", (75, 75))
 
 

ckeditor_uploader/widgets.py

@@ -1,4 +1,7 @@
-from django.core.urlresolvers import reverse
+try:
+    from django.urls import reverse
+except ImportError:  # Django < 2.0
+    from django.core.urlresolvers import reverse
 
 from ckeditor import widgets
 

tox.ini

@@ -3,6 +3,7 @@ skip_missing_interpreters=True
 envlist=
     py27-coverage-init
     {py27,py34}-django{18,19,110,111}
+    py34-django20
     py27-{lint,isort,coverage-report}
 
 [testenv]
@@ -22,7 +23,8 @@ deps=
     django19: Django>=1.9,<1.10
     django18: Django>=1.8,<1.9
     django110: Django>=1.10,<1.11
-    django111: Django>=1.11b1,<1.12
+    django111: Django>=1.11,<2.0
+    django20: Django>=2.0,<2.1
 
 [testenv:py27-coverage-init]
 setenv =