diff -r 9ce5f3e887ce -r 3a31881564ba project/urls.py --- a/project/urls.py Thu Jul 15 01:47:43 2010 +0530 +++ b/project/urls.py Fri Jul 16 01:33:33 2010 +0530 @@ -8,6 +8,11 @@ admin.autodiscover() +PROGRAM_PATTERN_CORE = r'[a-z](?:[0-9a-z]|_[0-9a-z])*' +EVENT_PATTERN_CORE =r'(?:[0-9a-z]|_[0-9a-z])*' +SCOPE_ARG_PATTERN = r'(?P%s/%s)' % ( + PROGRAM_PATTERN_CORE, EVENT_PATTERN_CORE) + # Admin urlpatterns = patterns('', url(r'^$', direct_to_template, {"template": "home.html"}, name='home'), @@ -27,11 +32,14 @@ # Registration urlpatterns += patterns('project.scipycon.registration.views', - url(r'^registrations/$', 'registrations', name='scipycon_registrations'), - url(r'^submit-registration/$', 'submit_registration', name='scipycon_submit_registration'), - url(r'^edit-registration/(?P\d+)/$', 'edit_registration', - name='scipycon_edit_registration'), - url(r'^download_csv/', 'download_csv', name="download_csv"), + url(r'^%s/registrations/$' % (SCOPE_ARG_PATTERN), 'registrations', + name='scipycon_registrations'), + url(r'^%s/submit-registration/$' % (SCOPE_ARG_PATTERN), + 'submit_registration', name='scipycon_submit_registration'), + url(r'^%s/edit-registration/(?P\d+)/$' % (SCOPE_ARG_PATTERN), + 'edit_registration', name='scipycon_edit_registration'), + url(r'^%s/download_csv/' % (SCOPE_ARG_PATTERN), + 'download_csv', name="download_csv"), )