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 <showard@google.com>
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