From 3e2f43a45fb6d4f7e279121198cb792f84c3ae09 Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
Date: Mon, 29 Jul 2013 18:08:14 +0200
Subject: Use patterns to simplify url definition

---
 papillon/urls.py | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/papillon/urls.py b/papillon/urls.py
index e0e9ed6..c3016e9 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('',
+urlpatterns = patterns('papillon.polls.views',
      (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'$', 'papillon.polls.views.index', name='index'),
-     url(base + r'create/$', 'papillon.polls.views.create', name='create'),
+     url(base + r'$', 'index', name='index'),
+     url(base + r'create/$', 'create', name='create'),
      url(base + r'edit/(?P<admin_url>\w+)/$',
-            'papillon.polls.views.edit', name='edit'),
+            'edit', name='edit'),
      url(base + r'editChoicesAdmin/(?P<admin_url>\w+)/$',
-            'papillon.polls.views.editChoicesAdmin', name='edit_choices_admin'),
+            'editChoicesAdmin', name='edit_choices_admin'),
      url(base + r'editChoicesUser/(?P<poll_url>\w+)/$',
-            'papillon.polls.views.editChoicesUser', name='edit_choices_user'),
+            'editChoicesUser', name='edit_choices_user'),
      url(base + r'category/(?P<category_id>\w+)/$',
-            'papillon.polls.views.category', name='category'),
-     url(base + r'poll/(?P<poll_url>\w+)/$', 'papillon.polls.views.poll',
+            'category', name='category'),
+     url(base + r'poll/(?P<poll_url>\w+)/$', 'poll',
             name='poll'),
-     url(base + r'poll/(?P<poll_url>\w+)/vote/$', 'papillon.polls.views.poll',
+     url(base + r'poll/(?P<poll_url>\w+)/vote/$', '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