p15693087
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed a case of incorrect parsing of quanitifers in reg-exp patterns. 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@8825 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Malcolm Tredinnick 2008-09-01 23:03:03 +00:00
parent eefec151d1
commit a9465a75de
3 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
django/utils/regex_helper.py
View File

@ -248,6 +248,7 @@ def get_quantifier(ch, input_iter):
while ch != '}': while ch != '}':
ch, escaped = input_iter.next() ch, escaped = input_iter.next()
quant.append(ch) quant.append(ch)
quant = quant[:-1]
values = ''.join(quant).split(',') values = ''.join(quant).split(',')
# Consume the trailing '?', if necessary. # Consume the trailing '?', if necessary.

1
tests/regressiontests/urlpatterns_reverse/tests.py
View File

@ -50,6 +50,7 @@ test_data = (
('mixed', '/john/0/', [], {'name': 'john'}), ('mixed', '/john/0/', [], {'name': 'john'}),
('repeats', '/repeats/a/', [], {}), ('repeats', '/repeats/a/', [], {}),
('repeats2', '/repeats/aa/', [], {}), ('repeats2', '/repeats/aa/', [], {}),
('repeats3', '/repeats/aa/', [], {}),
('insensitive', '/CaseInsensitive/fred', ['fred'], {}), ('insensitive', '/CaseInsensitive/fred', ['fred'], {}),
('test', '/test/1', [], {}), ('test', '/test/1', [], {}),
('test2', '/test/2', [], {}), ('test2', '/test/2', [], {}),

1
tests/regressiontests/urlpatterns_reverse/urls.py
View File

@ -35,6 +35,7 @@ urlpatterns = patterns('',
url(r'^(?P<name>.+)/\d+/$', empty_view, name="mixed"), url(r'^(?P<name>.+)/\d+/$', empty_view, name="mixed"),
url(r'^repeats/a{1,2}/$', empty_view, name="repeats"), 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,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'^(?i)CaseInsensitive/(\w+)', empty_view, name="insensitive"),
url(r'^test/1/?', empty_view, name="test"), url(r'^test/1/?', empty_view, name="test"),
url(r'^(?i)test/2/?$', empty_view, name="test2"), url(r'^(?i)test/2/?$', empty_view, name="test2"),