merged master into stable after new deployment

1 files changed, 9 insertions, 8 deletions

diff --git a/pv/urls.py b/pv/urls.py
index e55dddc..ec1cdff 100644
--- a/pv/urls.py
+++ b/pv/urls.py
@@ -1,19 +1,20 @@
 from django.conf import settings
-from django.conf.urls.defaults import *
+from django.conf.urls import patterns, url, include
 from django.contrib import admin
 
 admin.autodiscover()
 
 from program.views import json_day_schedule
+
 urlpatterns = patterns('',
-    (r'^admin/', include(admin.site.urls)),
-    (r'^program/', include('program.urls')),
-    (r'^nop', include('nop.urls')),
-    (r'^tinymce/', include('tinymce.urls')),
-    url(r'^export/day_schedule/(?P<year>\d{4})/(?P<month>\d{1,2})/(?P<day>\d{1,2})/$', json_day_schedule),
+                       url(r'^admin/', include(admin.site.urls)),
+                       url(r'^program/', include('program.urls')),
+                       url(r'^nop', include('nop.urls')),
+                       url(r'^tinymce/', include('tinymce.urls')),
+                       url(r'^export/day_schedule/(?P<year>\d{4})/(?P<month>\d{1,2})/(?P<day>\d{1,2})/$', json_day_schedule)
 )
 
 if settings.DEBUG:
     urlpatterns += patterns('',
-        (r'^site_media/(?P<path>.*)$', 'django.views.static.serve', {'document_root': settings.MEDIA_ROOT})
-    )
+                            (r'^site_media/(?P<path>.*)$', 'django.views.static.serve', {'document_root': settings.MEDIA_ROOT})
+)