Skip to content

Commit

Permalink
Handle both Django 1.11 and 2.0
Browse files Browse the repository at this point in the history
Use url() for v1.11, path() for v2.0.
  • Loading branch information
grahamu committed Mar 24, 2018
1 parent 1e3e849 commit 5058bea
Showing 1 changed file with 9 additions and 5 deletions.
14 changes: 9 additions & 5 deletions project_name/urls.py
Original file line number Diff line number Diff line change
@@ -1,12 +1,16 @@
from django.conf import settings
from django.urls import include, path
{% if django_version < "2" %}from django.conf.urls import include, url{% endif %}
from django.conf.urls.static import static

from django.contrib import admin
{% if django_version >= "2" %}from django.urls import include, path{% endif %}

urlpatterns = [
path("admin/", admin.site.urls),

urlpatterns = [{% if django_version >= "2" %}
path("", include("pinax.blog.urls", namespace="pinax_blog")),
]
path("admin/", admin.site.urls),
{% else %}
url(r"^$", include("pinax.blog.urls", namespace="pinax_blog")),
url(r"^admin/", admin.site.urls),
{% endif %}]

urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)

0 comments on commit 5058bea

Please sign in to comment.