aboutsummaryrefslogtreecommitdiffstats
path: root/servo/urls/search.py
diff options
context:
space:
mode:
authorFilipp Lepalaan <filipp@mac.com>2016-02-03 13:15:40 +0200
committerFilipp Lepalaan <filipp@mac.com>2016-02-03 13:15:40 +0200
commit904537c9dd343f92e4f95eb1e5e047e5ac7e8ca8 (patch)
tree9742797de4279285a5ec72d8c7adbb05292cf088 /servo/urls/search.py
parentead9662f6c3a0dfa77bf64c92c215f3e8367f902 (diff)
downloadServo-904537c9dd343f92e4f95eb1e5e047e5ac7e8ca8.tar.gz
Servo-904537c9dd343f92e4f95eb1e5e047e5ac7e8ca8.tar.bz2
Servo-904537c9dd343f92e4f95eb1e5e047e5ac7e8ca8.zip
Fix deprecation warnings in urlconfs
Diffstat (limited to 'servo/urls/search.py')
-rw-r--r--servo/urls/search.py15
1 files changed, 8 insertions, 7 deletions
diff --git a/servo/urls/search.py b/servo/urls/search.py
index 06278d6..d47d7aa 100644
--- a/servo/urls/search.py
+++ b/servo/urls/search.py
@@ -1,19 +1,20 @@
# -*- 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.search import search_gsx, get_gsx_search_results
-urlpatterns = patterns(
- "servo.views.search",
- url(r'^$', "spotlight", name="search-spotlight"),
- url(r'^customers/$', "customers", name="search-customers"),
+from servo.views.search import *
+
+urlpatterns = [
+ url(r'^$', spotlight, name="search-spotlight"),
+ url(r'^customers/$', customers, name="search-customers"),
url(r'^devices/(?P<what>\w+)/(?P<param>\w+)/(?P<query>[~\w\s,\-\(\)/\.]+)/$',
- "search_gsx",
+ search_gsx,
name="search-search_gsx"),
url(r'^gsx/(?P<what>\w+)/(?P<param>\w+)/(?P<query>[~\w\s,\-\(\)/\.]+)/$',
#cache_page(60*15)(get_gsx_search_results),
get_gsx_search_results,
name="search-get_gsx_search_results"),
-)
+]