Changeset 97399af

Timestamp:

May 13, 2010, 2:28:20 AM (15 years ago)

Author:

Alex Dehnert <adehnert@…>

Branches:

master, fysm-4-1, iframe, space-access, stable, stage, test-hooks

Children:

189506e

Parents:

dafa3c8

git-author:

Alex Dehnert <adehnert@…> (05/13/10 02:28:20)

git-committer:

Alex Dehnert <adehnert@…> (05/13/10 02:28:20)

Message:

w00t! Non-capturing groups

Location:

asadb

Files:

• forms/views.py (modified) (1 diff)
• urls.py (modified) (1 diff)

asadb/forms/views.py

@@ -5 +5 @@
 import datetime
 
-def fysm_by_years(request, _year, year, _category, category, ):
+def fysm_by_years(request, year, category, ):
     if year is None: year = datetime.date.today().year
     queryset = forms.models.FYSM.objects.filter(year=year).order_by('group__name')

asadb/urls.py

@@ -22 +22 @@
 
     # FYSM
-    url(r'^fysm/((\d+)/)?(([\w-]+)/)?$', forms.views.fysm_by_years, name='fysm', ),
+    url(r'^fysm/(?:(\d+)/)?(?:([\w-]+)/)?$', forms.views.fysm_by_years, name='fysm', ),
 
     # Uncomment the admin/doc line below and add 'django.contrib.admindocs'