- Removed errant "lower()" in the lexer which

was causing tags to compile with case-insensitive names, thus messing up custom <%call> names. [ticket:108]
sqlalchemy · Apr 19, 2009 · b06cd0f · b06cd0f
1 parent 43b362d
commit b06cd0f
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 27 deletions.
diff --git a/CHANGES b/CHANGES
@@ -24,6 +24,11 @@
 
 - Fixed lexing support for whitespace
   around '=' sign in defs. [ticket:102]
+
+- Removed errant "lower()" in the lexer which
+  was causing tags to compile with 
+  case-insensitive names, thus messing up
+  custom <%call> names. [ticket:108]
 
 0.2.4
 - Fixed compatibility with Jython 2.5b1.

diff --git a/lib/mako/lexer.py b/lib/mako/lexer.py
@@ -196,7 +196,7 @@ def match_tag_start(self):
             re.I | re.S | re.X)
 
         if match:
-            (keyword, attr, isend) = (match.group(1).lower(), match.group(2), match.group(3))
+            (keyword, attr, isend) = (match.group(1), match.group(2), match.group(3))
             self.keyword = keyword
             attributes = {}
             if attr:

diff --git a/test/def.py b/test/def.py
@@ -25,7 +25,6 @@ def test_def_blankargs(self):
         ${mycomp()}""")
         assert template.render(variable='hi').strip() == """hello mycomp hi"""
 
-
     def test_def_args(self):
         template = Template("""
         <%def name="mycomp(a, b)">

diff --git a/test/lexer.py b/test/lexer.py
@@ -41,11 +41,7 @@ def test_onlyclosed_tag(self):
             
             hi.
         """
-        try:
-            nodes = Lexer(template).parse()
-            assert False
-        except exceptions.SyntaxException, e:
-            assert str(e) == "Closing tag without opening tag: </%namespace> at line: 6 char: 13"
+        self.assertRaises(exceptions.SyntaxException, Lexer(template).parse)
 
     def test_unmatched_tag(self):
         template = """
@@ -58,22 +54,23 @@ def test_unmatched_tag(self):
         
         hi.
 """
-        try:
-            nodes = Lexer(template).parse()
-            assert False
-        except exceptions.SyntaxException, e:
-            assert str(e) == "Closing tag </%namespace> does not match tag: <%def> at line: 5 char: 13"
+        self.assertRaises(exceptions.SyntaxException, Lexer(template).parse)
 
     def test_nonexistent_tag(self):
         template = """
             <%lala x="5"/>
         """
-        try:
-            node = Lexer(template).parse()
-            assert False
-        except exceptions.CompileException, e:
-            assert str(e) == "No such tag: 'lala' at line: 2 char: 13"
+        self.assertRaises(exceptions.CompileException, Lexer(template).parse)
 
+    def test_wrongcase_tag(self):
+        template = """
+            <%DEF name="foo()">
+            </%def>
+        
+        """
+
+        self.assertRaises(exceptions.CompileException, Lexer(template).parse)
+
     def test_text_tag(self):
         template = """
         ## comment
@@ -105,23 +102,15 @@ def test_def_syntax(self):
             hi
         </%def>
 """
-        try:
-            node = Lexer(template).parse()
-            assert False
-        except exceptions.CompileException, e:
-            assert str(e) == "Missing attribute(s): 'name' at line: 2 char: 9"
+        self.assertRaises(exceptions.CompileException, Lexer(template).parse)
 
     def test_def_syntax_2(self):
         template = """
         <%def name="lala">
             hi
         </%def>
     """
-        try:
-            node = Lexer(template).parse()
-            assert False
-        except exceptions.CompileException, e:
-            assert str(e) == "Missing parenthesis in %def at line: 2 char: 9"
+        self.assertRaises(exceptions.CompileException, Lexer(template).parse)
 
     def test_whitespace_equals(self):
         template = """

diff --git a/test/namespace.py b/test/namespace.py
@@ -460,7 +460,23 @@ def test_custom_tag_3(self):
             "call body"
         ]
 
+    def test_custom_tag_case_sensitive(self):
+        t = Template("""
+        <%def name="renderPanel()">
+            panel ${caller.body()}
+        </%def>
 
+        <%def name="renderTablePanel()">
+            <%self:renderPanel>
+                hi
+            </%self:renderPanel>
+        </%def>
+        
+        <%self:renderTablePanel/>
+        """)
+        assert result_lines(t.render()) == ['panel', 'hi']
+
+
     def test_expr_grouping(self):
         """test that parenthesis are placed around string-embedded expressions."""