Commit a9465a75 authored by Malcolm Tredinnick's avatar Malcolm Tredinnick
Browse files

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
parent eefec151

django/utils/regex_helper.py

+1 −0
Original line number Diff line number Diff line
@@ -248,6 +248,7 @@ def get_quantifier(ch, input_iter): 
    while ch != '}':

        ch, escaped = input_iter.next()

        quant.append(ch)

    quant = quant[:-1]

    values = ''.join(quant).split(',')



    # Consume the trailing '?', if necessary.

tests/regressiontests/urlpatterns_reverse/tests.py

+1 −0
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ test_data = ( 
    ('mixed', '/john/0/', [], {'name': 'john'}),

    ('repeats', '/repeats/a/', [], {}),

    ('repeats2', '/repeats/aa/', [], {}),

    ('repeats3', '/repeats/aa/', [], {}),

    ('insensitive', '/CaseInsensitive/fred', ['fred'], {}),

    ('test', '/test/1', [], {}),

    ('test2', '/test/2', [], {}),

tests/regressiontests/urlpatterns_reverse/urls.py

+1 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ urlpatterns = patterns('', 
    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"),