From 904537c9dd343f92e4f95eb1e5e047e5ac7e8ca8 Mon Sep 17 00:00:00 2001
From: Filipp Lepalaan <filipp@mac.com>
Date: Wed, 3 Feb 2016 13:15:40 +0200
Subject: Fix deprecation warnings in urlconfs

---
 servo/urls/default.py | 29 ++++++++++++++++-------------
 1 file changed, 16 insertions(+), 13 deletions(-)

(limited to 'servo/urls/default.py')

diff --git a/servo/urls/default.py b/servo/urls/default.py
index d70d295..8f5d105 100644
--- a/servo/urls/default.py
+++ b/servo/urls/default.py
@@ -1,11 +1,16 @@
 # -*- coding: utf-8 -*-
 
-from django.conf.urls import patterns, include, url
+from django.conf.urls import include, url
 from django.views.generic import RedirectView, TemplateView
 from servo.views import account, files, gsx
 
-urlpatterns = patterns(
-    '',
+from servo.views.error import report
+from servo.views.note import show_barcode
+from servo.views.events import acknowledge
+from servo.views.tags import clear
+from servo.views.queue import statuses
+
+urlpatterns = [
     url(r'^$', RedirectView.as_view(url="orders/", permanent=False), name="home"),
 
     url(r'^checkin/', include('servo.urls.checkin')),
@@ -21,9 +26,9 @@ urlpatterns = patterns(
     url(r'^sales/', include('servo.urls.sales')),
     url(r'^diagnostics/', include('servo.urls.diagnostics')),
 
-    url(r'^queues/(\d+)/statuses/$', 'servo.views.queue.statuses'),
+    url(r'^queues/(\d+)/statuses/$', statuses),
 
-    url(r'^barcode/([\w\-]+)/$', 'servo.views.note.show_barcode',
+    url(r'^barcode/([\w\-]+)/$', show_barcode,
         name='barcodes-view'),
     url(r'^files/(?P<pk>\d+)/view/$', files.view_file, name="files-view_file"),
     url(r'^files/(?P<path>.+)/$', files.get_file, name="files-get_file"),
@@ -41,14 +46,12 @@ urlpatterns = patterns(
     url(r'^returns/part/(?P<part_id>\d+)/register_return/$', gsx.register_return,
         name='parts-register_return'),
 
-    url(r'^events/(\d+)/ack/', 'servo.views.events.acknowledge',
-        name="events-ack_event"),
-    url(r'^tags/(\d+)/clear/', 'servo.views.tags.clear', name="tags-clear"),
+    url(r'^events/(\d+)/ack/', acknowledge, name="events-ack_event"),
+    url(r'^tags/(\d+)/clear/', clear, name="tags-clear"),
+
+    url(r'^api/', include('servo.urls.api')),
+    url(r'^kaboom/$', report),
 
-    (r'^api/', include('servo.urls.api')),
-    (r'^kaboom/$', 'servo.views.error.report'),
-    
     url(r'^home/', include('servo.urls.account')),
     url(r'^search/', include('servo.urls.search')),
-
-)
+]
-- 
cgit v1.2.3