deplacement du fichier urls.py dans polls et suppression de __init__ et

urls

3 files changed, 17 insertions, 57 deletions

diff --git a/papillon/__init__.py b/papillon/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/papillon/__init__.py
+++ /dev/null
diff --git a/papillon/polls/urls.py b/papillon/polls/urls.py
new file mode 100644
index 0000000..9521d61
--- /dev/null
+++ b/papillon/polls/urls.py
@@ -0,0 +1,17 @@
+from django.conf.urls import patterns, url
+from polls import views
+
+from polls.feeds import PollLatestEntries
+
+urlpatterns = patterns('',
+    url(r'^$', views.index, name='index'),
+    url(r'create/$', views.create, name='create'),
+    url(r'edit/(?P<admin_url>\w+)/$', views.edit, name='edit'),
+    url(r'editChoicesAdmin/(?P<admin_url>\w+)/$', views.editChoicesAdmin, name='edit_choices_admin'),
+    url(r'editChoicesUser/(?P<poll_url>\w+)/$',
+        views.editChoicesUser, name='edit_choices_user'),
+    url(r'category/(?P<category_id>\w+)/$', views.category, name='category'),
+    url(r'poll/(?P<poll_url>\w+)/$', views.poll, name='poll'),
+    url(r'poll/(?P<poll_url>\w+)/vote/$', views.poll, name='vote'),
+    url(r'feeds/poll/(?P<poll_url>\w+)$', PollLatestEntries(), name='feed'),
+)
\ No newline at end of file
diff --git a/papillon/urls.py b/papillon/urls.py
deleted file mode 100644
index 84f5ed9..0000000
--- a/papillon/urls.py
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-# Copyright (C) 2008  Étienne Loks  <etienne.loks_AT_peacefrogsDOTnet>
-
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# See the file COPYING for details.
-
-import settings
-
-from django.conf.urls import patterns, url, include
-from django.contrib import admin
-from django.contrib.staticfiles.urls import staticfiles_urlpatterns
-admin.autodiscover()
-
-from polls.feeds import PollLatestEntries
-
-base = '^' + settings.EXTRA_URL
-if settings.EXTRA_URL and not base.endswith('/'):
-    base += '/'
-
-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'$', 'papillon.polls.views.index', name='index'),
-    url(base + r'create/$', 'papillon.polls.views.create', name='create'),
-    url(base + r'edit/(?P<admin_url>\w+)/$',
-        'papillon.polls.views.edit', name='edit'),
-    url(base + r'editChoicesAdmin/(?P<admin_url>\w+)/$',
-        'papillon.polls.views.editChoicesAdmin', name='edit_choices_admin'),
-    url(base + r'editChoicesUser/(?P<poll_url>\w+)/$',
-        'papillon.polls.views.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',
-        name='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'),
-)
-
-urlpatterns += staticfiles_urlpatterns()