Priprava na Django 1.9.

This commit is contained in:
Tomas 'Jethro' Pokorny 2016-01-09 18:47:38 +01:00
parent 3e46b3bec3
commit 85a2a10bf0

View file

@ -5,7 +5,7 @@ from django.contrib import admin
from django.conf import settings from django.conf import settings
from django.views.generic.base import TemplateView from django.views.generic.base import TemplateView
urlpatterns = patterns('', urlpatterns = [
# Admin a nastroje # Admin a nastroje
url(r'^admin/', include(admin.site.urls)), # NOQA url(r'^admin/', include(admin.site.urls)), # NOQA
@ -22,11 +22,11 @@ urlpatterns = patterns('',
url(r'^comments_dj/', include('django_comments.urls')), url(r'^comments_dj/', include('django_comments.urls')),
url(r'^comments_fl/', include('fluent_comments.urls')), url(r'^comments_fl/', include('fluent_comments.urls')),
) ]
# This is only needed when using runserver. # This is only needed when using runserver.
if settings.DEBUG: if settings.DEBUG:
urlpatterns = patterns('', urlpatterns = [
url(r'^media/(?P<path>.*)$', 'django.views.static.serve', # NOQA url(r'^media/(?P<path>.*)$', 'django.views.static.serve', # NOQA
{'document_root': settings.MEDIA_ROOT, 'show_indexes': True}), {'document_root': settings.MEDIA_ROOT, 'show_indexes': True}),
) + staticfiles_urlpatterns() + urlpatterns # NOQA ] + staticfiles_urlpatterns() + urlpatterns # NOQA