summaryrefslogtreecommitdiff
path: root/urls.py
diff options
context:
space:
mode:
authoretienne2008-08-20 10:05:51 +0000
committeretienne2008-08-20 10:05:51 +0000
commit1bbcb40a39f8d5c33aa092c6567f78cc47112b8a (patch)
tree120af5664fb4c141a47e0428216bfa43fa0c3546 /urls.py
parent91ecaf80b3959bc902c713bd8556757b296a2bd0 (diff)
Licence change to AGPL
Diffstat (limited to 'urls.py')
-rw-r--r--urls.py24
1 files changed, 19 insertions, 5 deletions
diff --git a/urls.py b/urls.py
index 9fb3b60..9db8686 100644
--- a/urls.py
+++ b/urls.py
@@ -1,17 +1,31 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
# Copyright (C) 2008 Étienne Loks <etienne.loks_AT_peacefrogsDOTnet>
-# This program can be distributed under the terms of the GNU GPL.
-# See the file COPYING.
+
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero 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 Affero General Public License for more details.
+
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+# See the file COPYING for details.
from django.conf.urls.defaults import *
urlpatterns = patterns('',
- # Uncomment this for admin:
(r'^admin/', include('django.contrib.admin.urls')),
(r'^papillon/$', 'papillon.polls.views.index'),
- (r'^papillon/edit/(?P<admin_url>\w+)/$', 'papillon.polls.views.createOrEdit'),
+ (r'^papillon/edit/(?P<admin_url>\w+)/$',
+ 'papillon.polls.views.createOrEdit'),
(r'^papillon/poll/(?P<poll_url>\w+)/$', 'papillon.polls.views.poll'),
(r'^papillon/poll/(?P<poll_url>\w+)/vote$', 'papillon.polls.views.poll'),
- (r'^static/(?P<path>.*)$', 'django.views.static.serve', {'document_root': 'static/'}),
+ (r'^static/(?P<path>.*)$', 'django.views.static.serve',
+ {'document_root': 'static/'}),
)