project/urls.py
changeset 120 e9172b05bba5
parent 109 0c24d69f0631
child 151 f85b864f5f8b
--- a/project/urls.py	Tue Jul 20 15:49:46 2010 +0530
+++ b/project/urls.py	Tue Jul 20 19:17:47 2010 +0530
@@ -1,10 +1,11 @@
+from django.conf import settings
 from django.conf.urls.defaults import include
 from django.conf.urls.defaults import patterns
-from django.conf import settings
+from django.conf.urls.defaults import url
 from django.contrib import admin
 from django.views.generic.simple import direct_to_template
 from django.views.generic.simple import redirect_to
-from django.conf.urls.defaults import *
+
 
 admin.autodiscover()
 
@@ -16,10 +17,10 @@
 # Admin
 urlpatterns = patterns('',
     url(r'^$', redirect_to, {'url': '/%s/' % (settings.CURRENT_SCOPE)}),
+    (r'^comments/', include('django.contrib.comments.urls')),
+    (r'^admin/(.*)', admin.site.root),
     url(r'^%s/$' % (SCOPE_ARG_PATTERN),
         direct_to_template, {"template": "home.html"}, name='home'),
-    (r'^comments/', include('django.contrib.comments.urls')),
-    (r'^admin/(.*)', admin.site.root),
 )
 
 # Talks, etc.
@@ -44,8 +45,6 @@
         'submit_registration', name='scipycon_submit_registration'),
     url(r'^%s/edit-registration/(?P<id>\d+)/$' % (SCOPE_ARG_PATTERN),
         'edit_registration', name='scipycon_edit_registration'),
-    url(r'^%s/download_csv/' % (SCOPE_ARG_PATTERN),
-        'download_csv', name="download_csv"),
     )
 
 # Authentication and Profile