Merge e9e5752 into 224d128

testtinymce/testapp/admin.py

@@ -1,7 +1,11 @@
-from django.core.urlresolvers import reverse
 from django.contrib import admin
 from django.contrib.flatpages.admin import FlatPageAdmin
 from django.contrib.flatpages.models import FlatPage
+try:
+    from django.urls import reverse
+except ImportError:
+    # Django < 1.10
+    from django.core.urlresolvers import reverse
 
 from testtinymce.testapp.models import TestPage, TestInline
 from tinymce.widgets import TinyMCE

tinymce/tests/test_views.py

@@ -112,7 +112,7 @@ def test_render_to_image_list(self):
         self.assertEqual('application/x-javascript', response['Content-Type'])
         self.assertEqual(result_ok, response.content)
 
-    @patch('tinymce.views.urlresolvers.reverse', return_value='/filebrowser')
+    @patch('tinymce.views.reverse', return_value='/filebrowser')
     def test_filebrowser(self, reverse_mock):
         response = self.client.get('/tinymce/filebrowser/')
         response_ok = b'function djangoFileBrowser(field_name, url, type, win) {\n    var url = "http://testserver/filebrowser?pop=2&type=" + type;\n\n    tinyMCE.activeEditor.windowManager.open(\n        {\n            \'file\': url,\n            \'width\': 820,\n            \'height\': 500,\n            \'resizable\': "yes",\n            \'scrollbars\': "yes",\n            \'inline\': "no",\n            \'close_previous\': "no"\n        },\n        {\n            \'window\': win,\n            \'input\': field_name,\n            \'editor_id\': tinyMCE.selectedInstance.editorId\n        }\n    );\n    return false;\n}\n'

tinymce/views.py

@@ -4,12 +4,16 @@
 import json
 import logging
 
-from django.core import urlresolvers
 from django.http import HttpResponse
 from django.shortcuts import render
 from django.utils.encoding import force_text
 from django.utils.translation import ugettext as _
 from django.views.decorators.csrf import csrf_exempt
+try:
+    from django.urls import reverse
+except ImportError:
+    # Django < 1.10
+    from django.core.urlresolvers import reverse
 
 from tinymce.compressor import gzip_compressor
 
@@ -101,9 +105,9 @@ def render_to_js_vardef(var_name, var_value):
 
 def filebrowser(request):
     try:
-        fb_url = request.build_absolute_uri(urlresolvers.reverse('fb_browse'))
+        fb_url = request.build_absolute_uri(reverse('fb_browse'))
     except:
-        fb_url = request.build_absolute_uri(urlresolvers.reverse('filebrowser:fb_browse'))
+        fb_url = request.build_absolute_uri(reverse('filebrowser:fb_browse'))
 
     return render(
         request,

tinymce/widgets.py

@@ -13,12 +13,16 @@
 from django import forms
 from django.conf import settings
 from django.contrib.admin import widgets as admin_widgets
-from django.core.urlresolvers import reverse
 from django.forms.utils import flatatt
 from django.utils.encoding import force_text
 from django.utils.html import escape
 from django.utils.safestring import mark_safe
 from django.utils.translation import get_language, ugettext as _
+try:
+    from django.urls import reverse
+except ImportError:
+    # Django < 1.10
+    from django.core.urlresolvers import reverse
 
 import tinymce.settings