From df27f8c352881846d44f40a9c20c88bc0195662d Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Tue, 30 Jul 2013 17:59:04 +0200
Subject: Revert "Use patterns to simplify url definition"

This reverts commit 3e2f43a45fb6d4f7e279121198cb792f84c3ae09.
---
 papillon/urls.py | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'papillon')

diff --git a/papillon/urls.py b/papillon/urls.py
index 24abe23..0f28b45 100644
--- a/papillon/urls.py
+++ b/papillon/urls.py
@@ -29,24 +29,24 @@ base = '^' + settings.EXTRA_URL
 if settings.EXTRA_URL and not base.endswith('/'):
     base += '/'
 
-urlpatterns = patterns('papillon.polls.views',
+urlpatterns = patterns('',
      (base + r'admin/doc/', include('django.contrib.admindocs.urls')),
      url(base + r'admin/jsi18n/$', 'django.views.i18n.javascript_catalog',
              name='admin_i18n'),
      url(base + r'^admin/', include(admin.site.urls)),
-     url(base + r'$', 'index', name='index'),
-     url(base + r'create/$', 'create', name='create'),
+     url(base + r'$', 'papillon.polls.views.index', name='index'),
+     url(base + r'create/$', 'papillon.polls.views.create', name='create'),
      url(base + r'edit/(?P<admin_url>\w+)/$',
-            'edit', name='edit'),
+            'papillon.polls.views.edit', name='edit'),
      url(base + r'editChoicesAdmin/(?P<admin_url>\w+)/$',
-            'editChoicesAdmin', name='edit_choices_admin'),
+            'papillon.polls.views.editChoicesAdmin', name='edit_choices_admin'),
      url(base + r'editChoicesUser/(?P<poll_url>\w+)/$',
-            'editChoicesUser', name='edit_choices_user'),
+            'papillon.polls.views.editChoicesUser', name='edit_choices_user'),
      url(base + r'category/(?P<category_id>\w+)/$',
-            'category', name='category'),
-     url(base + r'poll/(?P<poll_url>\w+)/$', 'poll',
+            'papillon.polls.views.category', name='category'),
+     url(base + r'poll/(?P<poll_url>\w+)/$', 'papillon.polls.views.poll',
             name='poll'),
-     url(base + r'poll/(?P<poll_url>\w+)/vote/$', 'poll',
+     url(base + r'poll/(?P<poll_url>\w+)/vote/$', 'papillon.polls.views.poll',
             name='vote'),
      url(base + r'feeds/poll/(?P<poll_url>\w+)$', PollLatestEntries(), name='feed'),
      (base + r'static/(?P<path>.*)$', 'django.views.static.serve',
-- 
cgit v1.2.3