Fix deprecation warnings in urlconfs

1 files changed, 24 insertions, 28 deletions

diff --git a/servo/urls/device.py b/servo/urls/device.py
index 2193369..317ff64 100644
--- a/servo/urls/device.py
+++ b/servo/urls/device.py
@@ -1,54 +1,50 @@
 # -*- coding: utf-8 -*-
 
-from django.conf.urls import patterns, url
+from django.conf.urls import url
 from django.views.decorators.cache import cache_page
 
 from servo.views.order import create
 from servo.views.diagnostics import diagnostics, select_test, run_test
+from servo.views.device import *
 
 
-urlpatterns = patterns(
-    "servo.views.device",
-    url(r'^$', 'index', name="devices-list"),
+urlpatterns = [
+    url(r'^$', index, name="devices-list"),
 
-    url(r'^find/$', "find", name="devices-find"),
-    url(r'^add/$', "edit_device", name="devices-add"),
+    url(r'^find/$', find, name="devices-find"),
+    url(r'^add/$', edit_device, name="devices-add"),
 
     url(r'^(?P<pk>\d+)/diags/$', diagnostics, name="devices-diagnostics"),
-    url(r'^(?P<pk>\d+)/diags/select_test/$', select_test, 
+    url(r'^(?P<pk>\d+)/diags/select_test/$', select_test,
         name="devices-select_test"),
-    url(r'^(?P<device>\d+)/diags/(?P<test_id>\d+)/run/$', run_test, 
+    url(r'^(?P<device>\d+)/diags/(?P<test_id>\d+)/run/$', run_test,
         name="devices-run_test"),
 
-    url(r'^(?P<pk>\d+)/repairs/$', 'search_gsx_repairs',
+    url(r'^(?P<pk>\d+)/repairs/$', search_gsx_repairs,
         name="devices-search_gsx_repairs"),
-    
-    url(r'^(?P<pk>\d+)/update_gsx_details/$', "update_gsx_details", 
+
+    url(r'^(?P<pk>\d+)/update_gsx_details/$', update_gsx_details,
         name="devices-update_gsx_details"),
     url(r'^(?P<pk>\d+)/orders/(?P<order_id>\d+)/queue/(?P<queue_id>\d+)/parts/$',
-        "parts", name="devices-parts"),
+        parts, name="devices-parts"),
 
-    url(r'^choose/order/(\d+)/$', 'choose', name="devices-choose"),
-    url(r'^upload/$', 'upload_devices', name="devices-upload_devices"),
-    url(r'^(?P<device_id>\d+)/orders/create/$', create, 
-        name="devices-create_order"),
-    url(r'^(?P<pk>\d+)/get_info/$', 'get_info', name="devices-get_info"),
+    url(r'^choose/order/(\d+)/$', choose, name="devices-choose"),
+    url(r'^upload/$', upload_devices, name="devices-upload_devices"),
+    url(r'^(?P<device_id>\d+)/orders/create/$', create, name="devices-create_order"),
+    url(r'^(?P<pk>\d+)/get_info/$', get_info, name="devices-get_info"),
 
-    url(r'^(?P<product_line>\w+)/$', "index", name="devices-list_devices"),
-    url(r'^(?P<product_line>\w+)/(?P<model>[\w\-]+)/$', "index",
+    url(r'^(?P<product_line>\w+)/$', index, name="devices-list_devices"),
+    url(r'^(?P<product_line>\w+)/(?P<model>[\w\-]+)/$', index,
         name="devices-list_devices"),
-    url(r'^(?P<product_line>\w+)/(?P<model>[\w\-]+)/parts/$', "model_parts",
+    url(r'^(?P<product_line>\w+)/(?P<model>[\w\-]+)/parts/$', model_parts,
         name="devices-model_parts"),
-    url(r'^(?P<product_line>\w+)/(?P<model>[\w\-]+)/(?P<pk>\d+)/$', "view_device",
+    url(r'^(?P<product_line>\w+)/(?P<model>[\w\-]+)/(?P<pk>\d+)/$', view_device,
         name="devices-view_device"),
 
-    url(r'^(?P<product_line>\w+)/(?P<model>[\w-]+)/(?P<pk>\d+)/edit/$', 
-        "edit_device",
+    url(r'^(?P<product_line>\w+)/(?P<model>[\w-]+)/(?P<pk>\d+)/edit/$', edit_device,
         name="devices-edit_device"),
-    url(r'^(?P<product_line>\w+)/(?P<model>[\w-]+)/create/$', "edit_device",
+    url(r'^(?P<product_line>\w+)/(?P<model>[\w-]+)/create/$', edit_device,
         name="devices-create_device"),
-    url(r'^(?P<product_line>\w+)/(?P<model>[\w-]+)/(?P<pk>\d+)/delete/$', 
-        "delete_device",
+    url(r'^(?P<product_line>\w+)/(?P<model>[\w-]+)/(?P<pk>\d+)/delete/$', delete_device,
         name="devices-delete_device"),
-
-)
+]