Add compatibility for Django 1.10

.travis.yml

@@ -5,9 +5,11 @@ env:
     - TOX_ENV=py27-django17
     - TOX_ENV=py27-django18
     - TOX_ENV=py27-django19
+    - TOX_ENV=py27-django110
     - TOX_ENV=py34-django17
     - TOX_ENV=py34-django18
     - TOX_ENV=py34-django19
+    - TOX_ENV=py34-django110
     - TOX_ENV=flake8
 install:
   - pip install tox

CHANGELOG.rst

@@ -7,7 +7,7 @@ This document describes changes between each past release.
 2.4.0 (unreleased)
 ==================
 
-- Nothing changed yet.
+- Added compatibility for Django 1.10.
 
 
 2.3.0 (2016-03-10)

docs/usage.rst

@@ -162,7 +162,7 @@ Create the widget::
   from tinymce.widgets import TinyMCE
 
   class SomeForm(forms.Form):
-      somefield = forms.CharField(widget=TinyMCE(mce_attrs={'external_link_list_url': reverse('someapp.views.someview')})
+      somefield = forms.CharField(widget=TinyMCE(mce_attrs={'external_link_list_url': reverse('someviewname')})
 
 Create the view::
 
@@ -199,7 +199,7 @@ the link dialog you could use something like this::
           if db_field.name == 'content':
               return db_field.formfield(widget=TinyMCE(
                   attrs={'cols': 80, 'rows': 30},
-                  mce_attrs={'external_link_list_url': reverse('tinymce.views.flatpages_link_list')},
+                  mce_attrs={'external_link_list_url': reverse('tinymce-linklist')},
               ))
           return super(TinyMCEFlatPageAdmin, self).formfield_for_dbfield(db_field, **kwargs)
 

testtinymce/settings.py

@@ -37,6 +37,13 @@
     'django.middleware.clickjacking.XFrameOptionsMiddleware',
 )
 
+TEMPLATES = [
+    {
+        'BACKEND': 'django.template.backends.django.DjangoTemplates',
+        'APP_DIRS': True,
+    },
+]
+
 SECRET_KEY = 'w4o4x^&b4h4zne9&3b1m-_p-=+&n_i_sdf@oz=gd+6h6v1$sd9'
 
 ROOT_URLCONF = 'testtinymce.urls'

testtinymce/testapp/admin.py

@@ -15,7 +15,7 @@ def formfield_for_dbfield(self, db_field, **kwargs):
         if db_field.name in ('content1', 'content2'):
             return db_field.formfield(widget=TinyMCE(
                 attrs={'cols': 80, 'rows': 30},
-                mce_attrs={'external_link_list_url': reverse('tinymce.views.flatpages_link_list')},
+                mce_attrs={'external_link_list_url': reverse('tinymce-linklist')},
             ))
         return super(TinyMCETestInlineAdmin, self).formfield_for_dbfield(db_field, **kwargs)
 
@@ -25,7 +25,7 @@ def formfield_for_dbfield(self, db_field, **kwargs):
         if db_field.name == 'content':
             return db_field.formfield(widget=TinyMCE(
                 attrs={'cols': 80, 'rows': 30},
-                mce_attrs={'external_link_list_url': reverse('tinymce.views.flatpages_link_list')},
+                mce_attrs={'external_link_list_url': reverse('tinymce-linklist')},
             ))
         return super(TinyMCEFlatPageAdmin, self).formfield_for_dbfield(db_field, **kwargs)
 
@@ -37,7 +37,7 @@ def formfield_for_dbfield(self, db_field, **kwargs):
         if db_field.name in ('content1', 'content2'):
             return db_field.formfield(widget=TinyMCE(
                 attrs={'cols': 80, 'rows': 30},
-                mce_attrs={'external_link_list_url': reverse('tinymce.views.flatpages_link_list')},
+                mce_attrs={'external_link_list_url': reverse('tinymce-linklist')},
             ))
         return super(TinyMCETestPageAdmin, self).formfield_for_dbfield(db_field, **kwargs)
 

tinymce/compressor.py

@@ -15,7 +15,6 @@
 from django.conf import settings
 from django.core.cache import cache
 from django.http import HttpResponse
-from django.template import RequestContext
 from django.template.loader import render_to_string
 from django.utils.text import compress_string
 from django.utils.cache import patch_vary_headers, patch_response_headers
@@ -65,7 +64,7 @@ def gzip_compressor(request):
     if not isJS:
         response.write(render_to_string('tinymce/tiny_mce_gzip.js', {
             'base_url': tinymce.settings.JS_BASE_URL,
-        }, context_instance=RequestContext(request)))
+        }))
         return response
 
     patch_vary_headers(response, ['Accept-Encoding'])

tinymce/urls.py

@@ -5,8 +5,8 @@
 from tinymce import views
 
 urlpatterns = [
-    url(r'^spellchecker/$', views.spell_check),
-    url(r'^flatpages_link_list/$', views.flatpages_link_list),
+    url(r'^spellchecker/$', views.spell_check, name='tinymce-spellcheck'),
+    url(r'^flatpages_link_list/$', views.flatpages_link_list, name='tinymce-linklist'),
     url(r'^compressor/$', views.compressor, name='tinymce-compressor'),
     url(r'^filebrowser/$', views.filebrowser, name='tinymce-filebrowser'),
 ]

tinymce/views.py

@@ -4,8 +4,7 @@
 import logging
 from django.core import urlresolvers
 from django.http import HttpResponse
-from django.shortcuts import render_to_response
-from django.template import RequestContext
+from django.shortcuts import render
 from django.utils.translation import ugettext as _
 from tinymce.compressor import gzip_compressor
 import json
@@ -117,5 +116,4 @@ def filebrowser(request):
     except:
         fb_url = request.build_absolute_uri(urlresolvers.reverse('filebrowser:fb_browse'))
 
-    return render_to_response('tinymce/filebrowser.js', {'fb_url': fb_url},
-                              context_instance=RequestContext(request))
+    return render(request, 'tinymce/filebrowser.js', {'fb_url': fb_url})

tinymce/widgets.py

@@ -151,6 +151,6 @@ def get_language_config(content_language=None):
         config['directionality'] = 'ltr'
 
     if tinymce.settings.USE_SPELLCHECKER:
-        config['spellchecker_rpc_url'] = reverse('tinymce.views.spell_check')
+        config['spellchecker_rpc_url'] = reverse('tinymce-spellcheck')
 
     return config

tox.ini

@@ -1,7 +1,7 @@
 [tox]
 envlist =
-    py27-django{16,17,18,19},
-    py34-django{17,18,19},
+    py27-django{16,17,18,19,110},
+    py34-django{17,18,19,110},
     flake8
 
 [testenv]
@@ -10,6 +10,7 @@ deps =
     django17: Django>=1.7,<1.8
     django18: Django>=1.8,<1.9
     django19: Django>=1.9,<1.10
+    django110: Django>=1.10,<1.11
     coverage
     mock
     pyenchant