summaryrefslogtreecommitdiff
path: root/chimere_example_project/urls.py
diff options
context:
space:
mode:
Diffstat (limited to 'chimere_example_project/urls.py')
-rw-r--r--chimere_example_project/urls.py13
1 files changed, 7 insertions, 6 deletions
diff --git a/chimere_example_project/urls.py b/chimere_example_project/urls.py
index fff1366..155696a 100644
--- a/chimere_example_project/urls.py
+++ b/chimere_example_project/urls.py
@@ -18,27 +18,28 @@
# See the file COPYING for details.
from django.conf import settings
-from django.conf.urls.defaults import *
+from django.conf.urls import patterns, url, include
from django.contrib import admin
from django.contrib.staticfiles.urls import staticfiles_urlpatterns
admin.autodiscover()
-urlpatterns = patterns('django.views.static',
+urlpatterns = patterns(
+ 'django.views.static',
(r'^%s(?P<path>.*)' % settings.MEDIA_URL[1:], 'serve',
{'document_root': settings.MEDIA_ROOT}),
)
if "tinymce" in settings.INSTALLED_APPS:
- urlpatterns += patterns('django.views.static',
+ urlpatterns += patterns(
+ 'django.views.static',
(r'^tinymce/', include('tinymce.urls')),)
urlpatterns += staticfiles_urlpatterns()
-urlpatterns += patterns('',
+urlpatterns += patterns(
+ '',
(r'^admin/doc/', include('django.contrib.admindocs.urls')),
(r'^admin/', include(admin.site.urls)),
url(r'^', include('chimere.urls', namespace="chimere")),
)
-
-