summaryrefslogtreecommitdiff
path: root/nop
diff options
context:
space:
mode:
Diffstat (limited to 'nop')
-rw-r--r--nop/urls.py16
1 files changed, 9 insertions, 7 deletions
diff --git a/nop/urls.py b/nop/urls.py
index 392d633..936af7a 100644
--- a/nop/urls.py
+++ b/nop/urls.py
@@ -1,13 +1,15 @@
-from django.conf.urls import patterns, url
+from django.conf.urls import url
+from django.views.static import serve
+
from views import get, get_current, nop_form
import os
NOP_SITE_MEDIA = os.path.join(os.path.dirname(__file__), 'site_media')
-urlpatterns = patterns('',
- url(r'^/get_current/?$', get_current),
- url(r'^/(?P<year>\d{4})/(?P<month>\d{1,2})/(?P<day>\d{1,2})/(?P<hour>\d{1,2})/(?P<minute>\d{1,2})/?$', get),
- url(r'^/?$', nop_form),
- url(r'^/static/(?P<path>.*)$', 'django.views.static.serve', {'document_root': NOP_SITE_MEDIA}),
- )
+urlpatterns = [
+ url(r'^get_current/?$', get_current),
+ url(r'^(?P<year>\d{4})/(?P<month>\d{1,2})/(?P<day>\d{1,2})/(?P<hour>\d{1,2})/(?P<minute>\d{1,2})/?$', get),
+ url(r'^$', nop_form),
+ url(r'^static/(?P<path>.*)$', serve, {'document_root': NOP_SITE_MEDIA}),
+]