- fixed bug in python generation when variable names are used

  with identifiers like "else", "finally", etc. inside them
  [ticket:68]

CHANGES

+0.2.0
+- fixed bug in python generation when variable names are used
+  with identifiers like "else", "finally", etc. inside them
+  [ticket:68]
+  
 0.1.10
 - fixed propagation of 'caller' such that nested %def calls
   within a <%call> tag's argument list propigates 'caller'

lib/mako/pygen.py

@@ -138,7 +138,7 @@ class PythonPrinter(object):
         
         # if the current line doesnt have one of the "unindentor" keywords,
         # return False
-        match = re.match(r"^\s*(else|elif|except|finally)", line)
+        match = re.match(r"^\s*(else|elif|except|finally).*\:", line)
         if not match: 
             return False
         

setup.py

 from setuptools import setup, find_packages
 
-version = '0.1.10'
+version = '0.2.0'
 
 setup(name='Mako',
       version=version,

test/pygen.py

@@ -99,7 +99,32 @@ and more block.
     do_more_stuff(g)
 
 """
-
+    
+    def test_false_unindendor(self):
+        stream = StringIO()
+        printer = PythonPrinter(stream)
+        for line in [
+            "try:",
+            "elsemyvar = 12",
+            "if True:",
+            "print 'hi'",
+            None,
+            "finally:",
+            "dosomething",
+            None
+        ]:
+            printer.writeline(line)
+        
+        assert stream.getvalue() == \
+"""try:
+    elsemyvar = 12
+    if True:
+        print 'hi'
+finally:
+    dosomething
+"""    , stream.getvalue()
+        
+        
     def test_backslash_line(self):
         block = \
 """