merged master into stable after new deployment

1 files changed, 7 insertions, 8 deletions

diff --git a/nop/urls.py b/nop/urls.py
index c4012a6..3cc97a4 100644
--- a/nop/urls.py
+++ b/nop/urls.py
@@ -1,14 +1,13 @@
-from django.conf.urls.defaults import *
+from django.conf.urls import patterns, url
 from views import get, get_current, nop_form
 
 import os
 
-NOP_STATIC_DIR = os.path.join(os.path.dirname(__file__), 'site_media')
+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_STATIC_DIR}),
+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}),
 )