diff options
author | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-09-22 23:06:12 +0200 |
---|---|---|
committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-09-22 23:06:12 +0200 |
commit | 8a8f25e156367807d174bbe858e8f66416306001 (patch) | |
tree | 001e62218954de6391f83e2436de816cc6c7a48a /chimere_example_project/urls.py | |
parent | 792fed91a5c0c218ede19b01d5d818730193a6b2 (diff) | |
download | Chimère-8a8f25e156367807d174bbe858e8f66416306001.tar.bz2 Chimère-8a8f25e156367807d174bbe858e8f66416306001.zip |
Going to python3 and Django 1.8!
Diffstat (limited to 'chimere_example_project/urls.py')
-rw-r--r-- | chimere_example_project/urls.py | 13 |
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")), ) - - |