Author: mtredinnick
Date: 2008-09-01 18:03:03 -0500 (Mon, 01 Sep 2008)
New Revision: 8825
Modified:
django/trunk/django/utils/regex_helper.py
django/trunk/tests/regressiontests/urlpatterns_reverse/tests.py
django/trunk/tests/regressiontests/urlpatterns_reverse/urls.py
Log:
Fixed a case of incorrect parsing of quanitifers in reg-exp patterns.
Modified: django/trunk/django/utils/regex_helper.py
===================================================================
--- django/trunk/django/utils/regex_helper.py 2008-09-01 22:59:43 UTC (rev
8824)
+++ django/trunk/django/utils/regex_helper.py 2008-09-01 23:03:03 UTC (rev
8825)
@@ -248,6 +248,7 @@
while ch != '}':
ch, escaped = input_iter.next()
quant.append(ch)
+ quant = quant[:-1]
values = ''.join(quant).split(',')
# Consume the trailing '?', if necessary.
Modified: django/trunk/tests/regressiontests/urlpatterns_reverse/tests.py
===================================================================
--- django/trunk/tests/regressiontests/urlpatterns_reverse/tests.py
2008-09-01 22:59:43 UTC (rev 8824)
+++ django/trunk/tests/regressiontests/urlpatterns_reverse/tests.py
2008-09-01 23:03:03 UTC (rev 8825)
@@ -50,6 +50,7 @@
('mixed', '/john/0/', [], {'name': 'john'}),
('repeats', '/repeats/a/', [], {}),
('repeats2', '/repeats/aa/', [], {}),
+ ('repeats3', '/repeats/aa/', [], {}),
('insensitive', '/CaseInsensitive/fred', ['fred'], {}),
('test', '/test/1', [], {}),
('test2', '/test/2', [], {}),
Modified: django/trunk/tests/regressiontests/urlpatterns_reverse/urls.py
===================================================================
--- django/trunk/tests/regressiontests/urlpatterns_reverse/urls.py
2008-09-01 22:59:43 UTC (rev 8824)
+++ django/trunk/tests/regressiontests/urlpatterns_reverse/urls.py
2008-09-01 23:03:03 UTC (rev 8825)
@@ -35,6 +35,7 @@
url(r'^(?P<name>.+)/\d+/$', empty_view, name="mixed"),
url(r'^repeats/a{1,2}/$', empty_view, name="repeats"),
url(r'^repeats/a{2,4}/$', empty_view, name="repeats2"),
+ url(r'^repeats/a{2}/$', empty_view, name="repeats3"),
url(r'^(?i)CaseInsensitive/(\w+)', empty_view, name="insensitive"),
url(r'^test/1/?', empty_view, name="test"),
url(r'^(?i)test/2/?$', empty_view, name="test2"),
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at
http://groups.google.com/group/django-updates?hl=en
-~----------~----~----~----~------~----~------~--~---
