Change URLconfs to collect results of calling patterns(), rather than collecting tuples and then passing them into patterns all at the end. Django documentation specifically states that it's OK to concatenate the result of patterns().
Also get rid of the from ... import * to conform to our coding style.
Signed-off-by: Steve Howard <[email protected]>
git-svn-id: http://test.kernel.org/svn/autotest/trunk@4042 592f7852-d20e-0410-864c-8624ca9c26a4
diff --git a/frontend/afe/urls.py b/frontend/afe/urls.py
index 976ff8b..c050a7b 100644
--- a/frontend/afe/urls.py
+++ b/frontend/afe/urls.py
@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import *
+from django.conf.urls import defaults
import common
from autotest_lib.frontend import settings, urls_common
from autotest_lib.frontend.afe.feeds import feed
@@ -7,15 +7,15 @@
'jobs' : feed.JobFeed
}
-pattern_list, debug_pattern_list = (
- urls_common.generate_pattern_lists('frontend.afe', 'AfeClient'))
+urlpatterns, debug_patterns = (
+ urls_common.generate_patterns('frontend.afe', 'AfeClient'))
# Job feeds
-debug_pattern_list.append((
- r'^feeds/(?P<url>.*)/$', 'frontend.afe.feeds.feed.feed_view',
- {'feed_dict': feeds}))
+debug_patterns += defaults.patterns(
+ '',
+ (r'^feeds/(?P<url>.*)/$', 'frontend.afe.feeds.feed.feed_view',
+ {'feed_dict': feeds})
+ )
if settings.DEBUG:
- pattern_list += debug_pattern_list
-
-urlpatterns = patterns('', *pattern_list)
+ urlpatterns += debug_patterns
diff --git a/frontend/planner/urls.py b/frontend/planner/urls.py
index 6a3516b..c636bc6 100644
--- a/frontend/planner/urls.py
+++ b/frontend/planner/urls.py
@@ -1,12 +1,10 @@
-from django.conf.urls.defaults import *
+from django.conf.urls import defaults
import common
from autotest_lib.frontend import settings, urls_common
-pattern_list, debug_pattern_list = (
- urls_common.generate_pattern_lists('frontend.planner',
+urlpatterns, debug_patterns = (
+ urls_common.generate_patterns('frontend.planner',
'TestPlannerClient'))
if settings.DEBUG:
- pattern_list += debug_pattern_list
-
-urlpatterns = patterns('', *pattern_list)
+ urlpatterns += debug_patterns
diff --git a/frontend/urls.py b/frontend/urls.py
index 2f113b1..189a515 100644
--- a/frontend/urls.py
+++ b/frontend/urls.py
@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import *
+from django.conf.urls import defaults
from django.conf import settings
# The next two lines enable the admin and load each admin.py file:
@@ -10,13 +10,15 @@
handler500 = 'frontend.afe.views.handler500'
-pattern_list = (
+urlpatterns = defaults.patterns(
+ '',
(RE_PREFIX + r'admin/(.*)', admin.site.root),
- (RE_PREFIX, include('frontend.afe.urls')),
- (PLANNER_RE_PREFIX, include('frontend.planner.urls')),
+ (RE_PREFIX, defaults.include('frontend.afe.urls')),
+ (PLANNER_RE_PREFIX, defaults.include('frontend.planner.urls')),
)
-debug_pattern_list = (
+debug_patterns = defaults.patterns(
+ '',
# redirect /tko and /results to local apache server
(r'^(?P<path>(tko|results)/.*)$',
'frontend.afe.views.redirect_with_extra_data',
@@ -24,6 +26,4 @@
)
if settings.DEBUG:
- pattern_list += debug_pattern_list
-
-urlpatterns = patterns('', *pattern_list)
+ urlpatterns += debug_patterns
diff --git a/frontend/urls_common.py b/frontend/urls_common.py
index d9636ba..2049e00 100644
--- a/frontend/urls_common.py
+++ b/frontend/urls_common.py
@@ -1,7 +1,8 @@
import os
+from django.conf.urls import defaults
-def generate_pattern_lists(django_name, gwt_name):
+def generate_patterns(django_name, gwt_name):
"""
Generates the common URL patterns for the given names
@@ -11,12 +12,13 @@
@return the common standard and the debug pattern lists, as a tuple
"""
- pattern_list = [
- (r'^(?:|noauth/)rpc/', '%s.views.handle_rpc' % django_name),
- (r'^rpc_doc', '%s.views.rpc_documentation' % django_name)
- ]
+ pattern_list = defaults.patterns(
+ django_name,
+ (r'^(?:|noauth/)rpc/', 'views.handle_rpc'),
+ (r'^rpc_doc', 'views.rpc_documentation'),
+ )
- debug_pattern_list = [
+ debug_pattern_list = defaults.patterns('',
(r'^model_doc/', '%s.views.model_documentation' % django_name),
# for GWT hosted mode
@@ -31,6 +33,6 @@
(r'^$', 'django.views.generic.simple.redirect_to',
{'url':
'client/autotest.%(name)s/%(name)s.html' % dict(name=gwt_name)}),
- ]
+ )
return (pattern_list, debug_pattern_list)
diff --git a/new_tko/tko/urls.py b/new_tko/tko/urls.py
index fc64e58..e36ffa8 100644
--- a/new_tko/tko/urls.py
+++ b/new_tko/tko/urls.py
@@ -3,7 +3,7 @@
from autotest_lib.frontend import settings, urls_common
pattern_list, debug_pattern_list = (
- urls_common.generate_pattern_lists(django_name='new_tko.tko',
+ urls_common.generate_patterns(django_name='new_tko.tko',
gwt_name='TkoClient'))
pattern_list += [(r'^(?:|noauth/)jsonp_rpc/',
