1 files changed, 17 insertions, 13 deletions
diff --git a/chimere_example_project/urls.py b/chimere_example_project/urls.py
index e1809b9..367fa59 100644
--- a/chimere_example_project/urls.py
+++ b/chimere_example_project/urls.py
@@ -18,27 +18,31 @@
 # See the file COPYING for details.
 
 from django.conf import settings
-from django.conf.urls import patterns, url, include
+from django.conf.urls import url, include
 
 from django.contrib import admin
 from django.contrib.staticfiles.urls import staticfiles_urlpatterns
 
+from django.views.static import serve
+
 admin.autodiscover()
-urlpatterns = patterns(
-    'django.views.static',
-    (r'^%s(?P<path>.*)' % settings.MEDIA_URL[1:], 'serve',
-     {'document_root': settings.MEDIA_ROOT}),
-)
+
+urlpatterns = []
+if settings.DEBUG:
+    urlpatterns += [
+        url(r'^media/(?P<path>.*)$', serve, {
+            'document_root': settings.MEDIA_ROOT,
+        }),
+    ]
 
 if "tinymce" in settings.INSTALLED_APPS:
-    urlpatterns += patterns(
-        'django.views.static',
-        (r'^tinymce/', include('tinymce.urls')),)
+    urlpatterns += [
+        url(r'^tinymce/', include('tinymce.urls')),
+    ]
 
 urlpatterns += staticfiles_urlpatterns()
 
-urlpatterns += patterns(
-    '',
-    (r'^admin/', include(admin.site.urls)),
+urlpatterns += [
+    url(r'^admin/', include(admin.site.urls)),
     url(r'^', include('chimere.urls', namespace="chimere")),
-)
+]