diff options
author | Ernesto Rico-Schmidt <e.rico.schmidt@gmail.com> | 2014-04-29 22:22:00 (GMT) |
---|---|---|
committer | Ernesto Rico-Schmidt <e.rico.schmidt@gmail.com> | 2014-04-29 22:22:00 (GMT) |
commit | ac251a798769bc5909d25a1f95a98822d46bfbb8 (patch) | |
tree | 46e3753599dbe8e02d6299a557ba707bedbd3acc /program/urls.py | |
parent | 185a79985c93c44e058ab4bf0345d2dafc4148ee (diff) |
pep8-ized code
Diffstat (limited to 'program/urls.py')
-rw-r--r-- | program/urls.py | 57 |
1 files changed, 37 insertions, 20 deletions
diff --git a/program/urls.py b/program/urls.py index 59caa2a..fbdc037 100644 --- a/program/urls.py +++ b/program/urls.py @@ -4,16 +4,19 @@ from django.views.decorators.cache import cache_page from django.views.generic.list_detail import object_detail, object_list from models import Host, Show, TimeSlot -from views import current_show, day_schedule, recommendations, show_list, week_schedule, styles +from views import current_show, day_schedule, recommendations, show_list, \ + week_schedule, styles from datetime import date hosts_dict = { - 'queryset': Host.objects.filter(shows__programslots__until__gte=date.today()).distinct(), + 'queryset': Host.objects.filter( + shows__programslots__until__gte=date.today()).distinct(), 'template_object_name': 'host' } shows_dict = { - 'queryset': Show.objects.filter(programslots__until__gt=date.today()).exclude(id=1).distinct(), + 'queryset': Show.objects.filter( + programslots__until__gt=date.today()).exclude(id=1).distinct(), 'template_object_name': 'show' } timeslots_dict = { @@ -23,24 +26,38 @@ timeslots_dict = { recommendations_dict = {'template_name': 'boxes/recommendations.html'} urlpatterns = patterns('', - url(r'^today/?$', day_schedule), - url(r'^(?P<year>\d{4})/(?P<month>\d{1,2})/(?P<day>\d{1,2})/?$', day_schedule), - url(r'^(?P<year>\d{4})/(?P<week>\d{1,2})/?$', week_schedule), - url(r'^current_box/?$', cache_page(current_show, 60)), - url(r'^hosts/?$', object_list, dict(hosts_dict, template_name='host_list.html')), - url(r'^hosts/(?P<object_id>\d+)/?$', object_detail, dict(hosts_dict, template_name='host_detail.html'), name='host-detail'), - url(r'^tips/?$', recommendations), - url(r'^tips_box/?$', recommendations, recommendations_dict), - url(r'^shows/?$', show_list), - url(r'^shows/(?P<slug>[\w-]+)/?$', object_detail, dict(shows_dict, template_name='show_detail.html'), name='show-detail'), - url(r'^(?P<object_id>\d+)/?$', object_detail, dict(timeslots_dict, template_name='timeslot_detail.html'), name='timeslot-detail'), - url(r'^week/?$', week_schedule), - url(r'^styles.css$', styles), -) + url(r'^today/?$', day_schedule), + url(r'^(?P<year>\d{4})/(?P<month>\d{1,2})/(?P<day>\d{1,2})/?$', + day_schedule), + url(r'^(?P<year>\d{4})/(?P<week>\d{1,2})/?$', + week_schedule), + url(r'^current_box/?$', cache_page(current_show, 60)), + url(r'^hosts/?$', + object_list, + dict(hosts_dict, template_name='host_list.html')), + url(r'^hosts/(?P<object_id>\d+)/?$', object_detail, + dict(hosts_dict, template_name='host_detail.html'), + name='host-detail'), + url(r'^tips/?$', recommendations), + url(r'^tips_box/?$', recommendations, + recommendations_dict), + url(r'^shows/?$', show_list), + url(r'^shows/(?P<slug>[\w-]+)/?$', object_detail, + dict(shows_dict, template_name='show_detail.html'), + name='show-detail'), + url(r'^(?P<object_id>\d+)/?$', object_detail, + dict(timeslots_dict, + template_name='timeslot_detail.html'), + name='timeslot-detail'), + url(r'^week/?$', week_schedule), + url(r'^styles.css$', styles)) if settings.DEBUG: import os - PROGRAM_STATIC_DIR = os.path.join(os.path.dirname(__file__), '../site_media') + + PROGRAM_STATIC_DIR = os.path.join(os.path.dirname(__file__), + '../site_media') urlpatterns += patterns('', - url(r'^static/(?P<path>.*)$', 'django.views.static.serve', {'document_root': PROGRAM_STATIC_DIR}), - ) + url(r'^static/(?P<path>.*)$', + 'django.views.static.serve', + {'document_root': PROGRAM_STATIC_DIR})) |