autotest: stop using django.urls.defaults (deprecated module)
BUG=chromium:711808
TEST=None
Change-Id: If33c59af9eadbf796ca2ef3ca343c79e4e30a031
Reviewed-on: https://chromium-review.googlesource.com/479586
Tested-by: Aviv Keshet <[email protected]>
Reviewed-by: Prathmesh Prabhu <[email protected]>
Commit-Queue: Aviv Keshet <[email protected]>
diff --git a/frontend/afe/urls.py b/frontend/afe/urls.py
index 118cd4b..507e136 100644
--- a/frontend/afe/urls.py
+++ b/frontend/afe/urls.py
@@ -1,4 +1,4 @@
-from django.conf.urls import defaults
+from django.conf import urls
from autotest_lib.frontend import settings, urls_common
from autotest_lib.frontend.afe.feeds import feed
@@ -10,11 +10,11 @@
urls_common.generate_patterns('frontend.afe', 'AfeClient'))
# File upload
-urlpatterns += defaults.patterns(
+urlpatterns += urls.patterns(
'', (r'^upload/', 'frontend.afe.views.handle_file_upload'))
# Job feeds
-debug_patterns += defaults.patterns(
+debug_patterns += urls.patterns(
'',
(r'^model_doc/', 'frontend.afe.views.model_documentation'),
(r'^feeds/(?P<url>.*)/$', 'frontend.afe.feeds.feed.feed_view',
diff --git a/frontend/tko/urls.py b/frontend/tko/urls.py
index f4f1321..d8219cb 100644
--- a/frontend/tko/urls.py
+++ b/frontend/tko/urls.py
@@ -1,11 +1,11 @@
-from django.conf.urls import defaults
+from django.conf import urls
import common
from autotest_lib.frontend import settings, urls_common
urlpatterns, debug_patterns = (
urls_common.generate_patterns('frontend.tko', 'TkoClient'))
-urlpatterns += defaults.patterns(
+urlpatterns += urls.patterns(
'',
(r'^(?:|noauth/)jsonp_rpc/', 'frontend.tko.views.handle_jsonp_rpc'),
(r'^(?:|noauth/)csv/', 'frontend.tko.views.handle_csv'),
diff --git a/frontend/urls.py b/frontend/urls.py
index e1ebf2c..88d6658 100644
--- a/frontend/urls.py
+++ b/frontend/urls.py
@@ -1,5 +1,5 @@
import os
-from django.conf.urls import defaults
+from django.conf import urls
from django.conf import settings
# The next two lines enable the admin and load each admin.py file:
@@ -12,19 +12,19 @@
handler404 = 'django.views.defaults.page_not_found'
handler500 = 'frontend.afe.views.handler500'
-urlpatterns = defaults.patterns(
+urlpatterns = urls.patterns(
'',
- (RE_PREFIX + r'admin/', defaults.include(admin.site.urls)),
- (RE_PREFIX, defaults.include('frontend.afe.urls')),
- (TKO_RE_PREFIX, defaults.include('frontend.tko.urls')),
+ (RE_PREFIX + r'admin/', urls.include(admin.site.urls)),
+ (RE_PREFIX, urls.include('frontend.afe.urls')),
+ (TKO_RE_PREFIX, urls.include('frontend.tko.urls')),
)
if os.path.exists(os.path.join(os.path.dirname(__file__),
'tko', 'site_urls.py')):
- urlpatterns += defaults.patterns(
- '', (TKO_RE_PREFIX, defaults.include('frontend.tko.site_urls')))
+ urlpatterns += urls.patterns(
+ '', (TKO_RE_PREFIX, urls.include('frontend.tko.site_urls')))
-debug_patterns = defaults.patterns(
+debug_patterns = urls.patterns(
'',
# redirect /tko and /results to local apache server
(r'^(?P<path>(tko|results)/.*)$',
diff --git a/frontend/urls_common.py b/frontend/urls_common.py
index ed0d3ce..b350fca 100644
--- a/frontend/urls_common.py
+++ b/frontend/urls_common.py
@@ -1,5 +1,5 @@
import os
-from django.conf.urls import defaults
+from django.conf import urls
from django.views import generic
@@ -13,13 +13,13 @@
@return the common standard and the debug pattern lists, as a tuple
"""
- pattern_list = defaults.patterns(
+ pattern_list = urls.patterns(
django_name,
(r'^(?:|noauth/)rpc/', 'views.handle_rpc'),
(r'^rpc_doc', 'views.rpc_documentation'),
)
- debug_pattern_list = defaults.patterns('',
+ debug_pattern_list = urls.patterns('',
# for GWT hosted mode
(r'^(?P<forward_addr>autotest.*)',
'autotest_lib.frontend.afe.views.gwt_forward'),
