Merge commit 'origin/next' into next

2 files changed, 40 insertions, 1 deletions

diff --git a/SetupConfig.py b/SetupConfig.py
index 3848f22..61e304d 100644
--- a/SetupConfig.py
+++ b/SetupConfig.py
@@ -51,7 +51,7 @@ scripts = ['bin/cheetah-compile',
            'bin/cheetah',
            ]
 
-data_files = ['recursive: src *.tmpl *.txt LICENSE README TODO CHANGES',]
+data_files = ['recursive: cheetah *.tmpl *.txt LICENSE README TODO CHANGES',]
 
 if not os.getenv('CHEETAH_INSTALL_WITHOUT_SETUPTOOLS'):
     try:
diff --git a/cheetah/Tests/Cheps.py b/cheetah/Tests/Cheps.py
new file mode 100644
index 0000000..7918435
--- /dev/null
+++ b/cheetah/Tests/Cheps.py
@@ -0,0 +1,39 @@
+#!/usr/bin/env python
+
+import unittest
+
+import Cheetah
+import Cheetah.Parser
+import Cheetah.Template
+
+class Chep_2_Conditionalized_Import_Behavior(unittest.TestCase):
+    def test_ModuleLevelImport(self):
+        ''' Verify module level (traditional) import behavior '''
+        pass
+
+    def test_InlineImport(self):
+        ''' Verify (new) inline import behavior works '''
+        template = '''
+            #def funky($s)
+                #try
+                    #import urllib
+                #except ImportError
+                    #pass
+                #end try
+                #return urllib.quote($s)
+            #end def
+        '''
+        try:
+            template = Cheetah.Template.Template.compile(template)
+        except Cheetah.Parser.ParseError, ex:
+            self.fail('Failed to properly generate code %s' % ex)
+        template = template()
+        rc = tepmlate.funky('abc def')
+        assert rc == 'abc+def'
+
+    def test_LegacyMode(self):
+        ''' Verify disabling of CHEP #2 works '''
+        pass
+
+if __name__ == '__main__':
+    unittest.main()