Skip to content

Commit

Permalink
Travis tests: Django 1.10 compatiblity fix for url patterns
Browse files Browse the repository at this point in the history
  • Loading branch information
darklow committed Aug 18, 2016
1 parent 995264e commit c72bedb
Showing 1 changed file with 12 additions and 5 deletions.
17 changes: 12 additions & 5 deletions suit/tests/urls/__init__.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,16 @@
from django.conf.urls import patterns, include, url
from django.conf.urls import include, url
from django.contrib import admin

admin.autodiscover()

urlpatterns = patterns('',
# Examples for custom menu
url(r'^admin/', include(admin.site.urls)),
)
try:
from django.conf.urls import patterns
urlpatterns = patterns(
'',
# Examples for custom menu
url(r'^admin/', include(admin.site.urls)),
)
except ImportError: # Django 1.10+
urlpatterns = [
url(r'^admin/', include(admin.site.urls)),
]

0 comments on commit c72bedb

Please sign in to comment.