From 41d65a62e0d9ebb6e64661ac9ac014d5aa71c85c Mon Sep 17 00:00:00 2001
From: Johannes Raggam <raggam-nl@adm.at>
Date: Fri, 8 Apr 2011 15:50:51 +0200
Subject: make trailing slash optional


diff --git a/helsinki/program/urls_program.py b/helsinki/program/urls_program.py
index e310b43..f68d376 100644
--- a/helsinki/program/urls_program.py
+++ b/helsinki/program/urls_program.py
@@ -6,18 +6,18 @@ from models import Host, Show, TimeSlot
 from views import current_show, day_schedule, recommendations, show_list, today_schedule, week_schedule
 
 urlpatterns = patterns('',
-    ('^/today/$', today_schedule),
-    ('^/(?P<year>\d{4})/(?P<month>\d{1,2})/(?P<day>\d{1,2})/$', day_schedule),
-    ('^/(?P<year>\d{4})/(?P<week>\d{1,2})/$', week_schedule),
-    ('^/current_box/$', current_show),
-    ('^/hosts/$', object_list, dict(template_object_name='host', queryset=Host.objects.all())),
-    url('^/hosts/(?P<object_id>\d+)/$', object_detail, dict(template_object_name='host', queryset=Host.objects.all()), name='host-detail'),
-    ('^/tips/$', recommendations),
-    ('^/tips_box/$', recommendations, dict(template_name='program/recommendations_box.html')),
-    ('^/shows/$', show_list),
-    url('^/shows/(?P<slug>[\w-]+)/$', object_detail, dict(template_object_name='show', queryset=Show.objects.all()), name='show-detail'),
-    url('^/(?P<object_id>\d+)/$', object_detail, dict(template_object_name='timeslot', queryset=TimeSlot.objects.all()), name='timeslot-detail'),
+    ('^/today/?$', today_schedule),
+    ('^/(?P<year>\d{4})/(?P<month>\d{1,2})/(?P<day>\d{1,2})/?$', day_schedule),
+    ('^/(?P<year>\d{4})/(?P<week>\d{1,2})/?$', week_schedule),
+    ('^/current_box/?$', current_show),
+    ('^/hosts/?$', object_list, dict(template_object_name='host', queryset=Host.objects.all())),
+    url('^/hosts/(?P<object_id>\d+)/?$', object_detail, dict(template_object_name='host', queryset=Host.objects.all()), name='host-detail'),
+    ('^/tips/?$', recommendations),
+    ('^/tips_box/?$', recommendations, dict(template_name='program/recommendations_box.html')),
+    ('^/shows/?$', show_list),
+    url('^/shows/(?P<slug>[\w-]+)/?$', object_detail, dict(template_object_name='show', queryset=Show.objects.all()), name='show-detail'),
+    url('^/(?P<object_id>\d+)/?$', object_detail, dict(template_object_name='timeslot', queryset=TimeSlot.objects.all()), name='timeslot-detail'),
     # TODO: implement
-    ('^/week/$', today_schedule),
-    ('^/topics/$', recommendations),
+    ('^/week/?$', today_schedule),
+    ('^/topics/?$', recommendations),
 )
-- 
cgit v0.10.2