Changeset 38

Show
Ignore:
Timestamp:
07/11/04 23:43:01 (4 years ago)
Author:
chris
Message:

Exposed a case sensitive bug on the Assignment operator, fixed it, and fixed the bug related to ArrayLiterals? within a block of text.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/airspeed.py

    r36 r38  
    278278 
    279279class ArrayLiteral(_Element): 
    280     START = re.compile(r'\[[ \t]*(.*)$') 
    281     END = re.compile(r'[ \t]*\](.*)$') 
     280    START = re.compile(r'\[[ \t]*(.*)$', re.S) 
     281    END =   re.compile(r'[ \t]*\](.*)$', re.S) 
    282282    values = _EmptyValues() 
    283283 
    …… 
    498498 
    499499class Assignment(_Element): 
    500     START = re.compile(r'\s*\(\s*\$([a-z_][a-z0-9_]*)\s*=\s*(.*)$', re.S) 
     500    START = re.compile(r'\s*\(\s*\$([a-z_][a-z0-9_]*)\s*=\s*(.*)$', re.S + re.I) 
    501501    END = re.compile(r'\s*\)(?:[ \t]*\r?\n)?(.*)$', re.S + re.M) 
    502502 

  • trunk/airspeed_test.py

    r37 r38  
    382382 
    383383    def test_array_literal(self): 
    384         template = airspeed.Template('blah\n#set($values = ["Hello ", $person, ", your lucky number is ", 7])\n#foreach($value in $values)$value#end') 
    385         self.assertEquals('blah\nHello Chris, your lucky number is 7', template.merge({'person': 'Chris'})) 
     384        template = airspeed.Template('blah\n#set($valuesInList = ["Hello ", $person, ", your lucky number is ", 7])\n#foreach($value in $valuesInList)$value#end\nblah') 
     385        self.assertEquals('blah\nHello Chris, your lucky number is 7\nblah', template.merge({'person': 'Chris'})) 
    386386 
    387387    def test_nested_array_literals(self):