summaryrefslogtreecommitdiffstats
path: root/urls.py
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2011-10-11 19:29:15 -0500
committerDan McGee <dan@archlinux.org>2011-10-11 19:29:15 -0500
commit71e57570c262fffb11ca6e0dc97342119198f740 (patch)
tree3736af12cda316baffbcc4e5ba2a43f41901b847 /urls.py
parenta01a11cfad84bd44c1f5aeffcc0665bd93889e1d (diff)
downloadarchweb-71e57570c262fffb11ca6e0dc97342119198f740.tar.gz
archweb-71e57570c262fffb11ca6e0dc97342119198f740.zip
Pylint suggested and other cleanups
Signed-off-by: Dan McGee <dan@archlinux.org>
Diffstat (limited to 'urls.py')
-rw-r--r--urls.py15
1 files changed, 8 insertions, 7 deletions
diff --git a/urls.py b/urls.py
index edd51b52..575910ea 100644
--- a/urls.py
+++ b/urls.py
@@ -1,6 +1,7 @@
import os.path
-from django.conf.urls.defaults import *
+# Stupid Django. Don't remove these "unused" handler imports
+from django.conf.urls.defaults import handler500, handler404, include, patterns
from django.conf import settings
from django.contrib import admin
@@ -11,7 +12,7 @@ from django.views.i18n import null_javascript_catalog
from feeds import PackageFeed, NewsFeed
import sitemaps
-sitemaps = {
+our_sitemaps = {
'base': sitemaps.BaseSitemap,
'news': sitemaps.NewsSitemap,
'packages': sitemaps.PackagesSitemap,
@@ -36,9 +37,9 @@ feeds_patterns = patterns('',
# Sitemaps
urlpatterns += patterns('django.contrib.sitemaps.views',
(r'^sitemap.xml$', 'index',
- {'sitemaps': sitemaps}),
+ {'sitemaps': our_sitemaps}),
(r'^sitemap-(?P<section>.+)\.xml$', 'sitemap',
- {'sitemaps': sitemaps}),
+ {'sitemaps': our_sitemaps}),
)
# Authentication / Admin
@@ -58,9 +59,9 @@ urlpatterns += patterns('public.views',
{}, 'page-art'),
(r'^svn/$', TemplateView.as_view(template_name='public/svn.html'),
{}, 'page-svn'),
- (r'^developers/$', 'userlist', { 'type':'devs' }, 'page-devs'),
- (r'^trustedusers/$', 'userlist', { 'type':'tus' }, 'page-tus'),
- (r'^fellows/$', 'userlist', { 'type':'fellows' }, 'page-fellows'),
+ (r'^developers/$', 'userlist', { 'user_type':'devs' }, 'page-devs'),
+ (r'^trustedusers/$', 'userlist', { 'user_type':'tus' }, 'page-tus'),
+ (r'^fellows/$', 'userlist', { 'user_type':'fellows' }, 'page-fellows'),
(r'^donate/$', 'donate', {}, 'page-donate'),
(r'^download/$', 'download', {}, 'page-download'),
)