Skip to content

Commit b7ffd83

Browse files
committed
Updated urls.py to use modern conventions:
- don't use string imports - don't use partterns()
1 parent 0de81f3 commit b7ffd83

File tree

2 files changed

+19
-20
lines changed

2 files changed

+19
-20
lines changed

testtinymce/urls.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
from django.conf import settings
22
from django.contrib.staticfiles.urls import staticfiles_urlpatterns
33
from django.contrib import admin
4-
try:
5-
from django.conf.urls import patterns, include, url
6-
except ImportError:
7-
from django.conf.urls.defaults import patterns, include, url
4+
from django.conf.urls import include, url
5+
6+
import tinymce.urls
87

98
admin.autodiscover()
109

11-
urlpatterns = patterns('',
12-
url(r'^tinymce/', include('tinymce.urls')),
10+
urlpatterns = [
11+
url(r'^tinymce/', include(tinymce.urls)),
1312
url(r'^admin/', include(admin.site.urls)),
1413
#url(r'^%s(?P<path>.*)$' % settings.MEDIA_URL[1:],
1514
# 'django.views.static.serve', {"document_root": settings.MEDIA_ROOT}),
16-
)
15+
]
16+
1717
urlpatterns += staticfiles_urlpatterns()

tinymce/urls.py

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
11
# Copyright (c) 2008 Joost Cassee
22
# Licensed under the terms of the MIT License (see LICENSE.txt)
33

4-
try:
5-
from django.conf.urls import url, patterns
6-
except:
7-
from django.conf.urls.defaults import url, patterns
4+
from django.conf.urls import url
85

9-
urlpatterns = patterns('tinymce.views',
10-
url(r'^js/textareas/(?P<name>.+)/$', 'textareas_js', name='tinymce-js'),
11-
url(r'^js/textareas/(?P<name>.+)/(?P<lang>.*)$', 'textareas_js', name='tinymce-js-lang'),
12-
url(r'^spellchecker/$', 'spell_check'),
13-
url(r'^flatpages_link_list/$', 'flatpages_link_list'),
14-
url(r'^compressor/$', 'compressor', name='tinymce-compressor'),
15-
url(r'^filebrowser/$', 'filebrowser', name='tinymce-filebrowser'),
16-
url(r'^preview/(?P<name>.+)/$', 'preview', name='tinymce-preview'),
17-
)
6+
from . import views
7+
8+
urlpatterns = [
9+
url(r'^js/textareas/(?P<name>.+)/$', views.textareas_js, name='tinymce-js'),
10+
url(r'^js/textareas/(?P<name>.+)/(?P<lang>.*)$', views.textareas_js, name='tinymce-js-lang'),
11+
url(r'^spellchecker/$', views.spell_check),
12+
url(r'^flatpages_link_list/$', views.flatpages_link_list),
13+
url(r'^compressor/$', views.compressor, name='tinymce-compressor'),
14+
url(r'^filebrowser/$', views.filebrowser, name='tinymce-filebrowser'),
15+
url(r'^preview/(?P<name>.+)/$', views.preview, name='tinymce-preview'),
16+
]

0 commit comments

Comments
 (0)