Django 1.9 deprecated string based url names and django.conf.url.patterns

[htsworkflow.git] / htsworkflow / urls.py

diff --git a/htsworkflow/urls.py b/htsworkflow/urls.py
index dc47cf45e76c6b163622d1dbd6982bc264809302..02af9b3c606dc21a22caa8137be3c3a7064e0f5a 100644 (file)
--- a/htsworkflow/urls.py
+++ b/htsworkflow/urls.py
@@ -1,30 +1,33 @@
-from django.conf.urls import include, patterns, url
+from django.conf.urls import include,  url
 from django.contrib import admin
 admin.autodiscover()
 
-from django.conf import settings
 
-urlpatterns = patterns('',
+from experiments.views import (
+    flowcell_lane_detail,
+    flowcell_detail,
+    lanes_for,
+    sequencer,
+)
+from samples.views import library_id_to_admin_url
+
+urlpatterns = [
     url('^accounts/', include('django.contrib.auth.urls')),
     # Base:
     url(r'^eland_config/', include('eland_config.urls')),
     # Experiments:
     url(r'^experiments/', include('experiments.urls')),
-    url(r'^lane/(?P<lane_pk>\w+)',
-        'experiments.views.flowcell_lane_detail'),
-    url(r'^flowcell/(?P<flowcell_id>\w+)/((?P<lane_number>\w+)/)?$',
-        'experiments.views.flowcell_detail'),
+    url(r'^lane/(?P<lane_pk>\w+)', flowcell_lane_detail),
+    url(r'^flowcell/(?P<flowcell_id>\w+)/((?P<lane_number>\w+)/)?$', flowcell_detail),
     url(r'^inventory/', include('inventory.urls')),
     url(r'^library/', include('samples.urls')),
-    url(r'^lanes_for/$', 'experiments.views.lanes_for'),
-    url(r'^lanes_for/(?P<username>[-_ \w]+)', 'experiments.views.lanes_for'),
+    url(r'^lanes_for/$', lanes_for),
+    url(r'^lanes_for/(?P<username>[-_ \w]+)', lanes_for),
     ### library id to admin url
-    url(r'^library_id_to_admin_url/(?P<lib_id>\w+)/$',
-        'samples.views.library_id_to_admin_url'),
+    url(r'^library_id_to_admin_url/(?P<lib_id>\w+)/$', library_id_to_admin_url),
     ### sample / library information
     url(r'^samples/', include('samples.urls')),
-    url(r'^sequencer/(?P<sequencer_id>\w+)',
-        'experiments.views.sequencer'),
+    url(r'^sequencer/(?P<sequencer_id>\w+)', sequencer),
 
     url(r'^admin/', include(admin.site.urls)),
-)
+]