mkexp: re-enabled Jinja statement and comment syntax, now using '__mkexp__' keyword

CHANGES.txt

@@ -15,6 +15,8 @@ Global
 * Fixed test suite to clean up all temporary files
 * Fixed tool 'cppath' to not choke when called twice on the same directory
 * Changed 'set' test to work, and return False, on undefined variables
+* Re-enabled Jinja statement and comment syntax, now using '__mkexp__' keyword
+  ({%__mkexp__ ... %}, {#__mkexp__ ... #})
 
 Release 1.0.1
 =============

mkexp

@@ -302,8 +302,8 @@ template_env = Environment(
     variable_end_string = '}',
     line_statement_prefix = '#%',
     line_comment_prefix = '#%#',
-    block_start_string = '{%DiSaBlEdAnDuNlIkElY',
-    comment_start_string = '{#DiSaBlEdAnDuNlIkElY',
+    block_start_string = '{%__mkexp__',
+    comment_start_string = '{#__mkexp__',
     extensions=['jinja2.ext.do']
 )    
 

test.py

@@ -701,5 +701,25 @@ class GetTemplatesTestCase(MkexpSimpleTestCase):
             EXP_ID = """+other_exp_id+"""
         """)
 
+class DelimiterTestCase(MkexpSimpleTestCase):
+
+    def test_statement(self):
+        self.run_test("""
+            {%__mkexp__
+                set x = 'Hello, world!'
+            %}
+            %{x}
+        """, """
+            Hello, world!
+        """)
+
+    def test_comment(self):
+        self.run_test("""
+            {#__mkexp__
+                Now you see me - now you don't
+            #}
+        """, """
+        """)
+
 if __name__ == '__main__':
     unittest.main()