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

[htsworkflow.git] / inventory / urls.py

diff --git a/inventory/urls.py b/inventory/urls.py
index 98ece191231dd9b48d48ae0ea770c9aa34b7e614..4dcf1bd2bd52ea8f69d346affe1c8d8f42c78ebc 100644 (file)
--- a/inventory/urls.py
+++ b/inventory/urls.py
@@ -1,18 +1,29 @@
 from __future__ import unicode_literals
 
-from django.conf.urls import patterns
+from django.conf.urls import url
 
-urlpatterns = patterns('',
+from .views import (
+    data_items,
+    link_flowcell_and_device,
+    itemtype_index,
+    item_summary_by_uuid,
+    item_print,
+    item_summary_by_barcode,
+    all_index,
+    index
+
+)
+urlpatterns = [
     # DATA
-     (r'^data/items/$', 'inventory.views.data_items'),
+    url(r'^data/items/$', data_items),
     # REMOTE LINKING
-     (r'^lts/link/(?P<flowcell>.+)/(?P<serial>.+)/$', 'inventory.views.link_flowcell_and_device'),
+    url(r'^lts/link/(?P<flowcell>.+)/(?P<serial>.+)/$', link_flowcell_and_device),
 
     # INDEX
-    (r'^it/(?P<name>.+)/$', 'inventory.views.itemtype_index'),
-    (r'^(?P<uuid>[a-fA-F0-9]{32})/$', 'inventory.views.item_summary_by_uuid'),
-    (r'^(?P<uuid>[a-fA-F0-9]{32})/print/$', 'inventory.views.item_print'),
-    (r'^(?P<barcode_id>.+)/$', 'inventory.views.item_summary_by_barcode'),
-    (r'^all_index/$', 'inventory.views.all_index'),
-    (r'^$', 'inventory.views.index')
-    )
+    url(r'^it/(?P<name>.+)/$', itemtype_index),
+    url(r'^(?P<uuid>[a-fA-F0-9]{32})/$', item_summary_by_uuid),
+    url(r'^(?P<uuid>[a-fA-F0-9]{32})/print/$', item_print),
+    url(r'^(?P<barcode_id>.+)/$', item_summary_by_barcode),
+    url(r'^all_index/$', all_index),
+    url(r'^$', index)
+]