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/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)
