Merge branch 'next' of git@github.com:rtyler/cheetah into next

4 files changed, 2 insertions, 6 deletions

diff --git a/SetupConfig.py b/SetupConfig.py
index bcf5ca3..3848f22 100644
--- a/SetupConfig.py
+++ b/SetupConfig.py
@@ -33,7 +33,6 @@ package_dir = {'Cheetah':'cheetah'}
 
 import os
 import os.path
-import sys
 from distutils.core import Extension
 
 ext_modules=[
@@ -52,9 +51,6 @@ scripts = ['bin/cheetah-compile',
            'bin/cheetah',
            ]
 
-if sys.platform == "win32":
-    scripts.append('bin/cheetah.bat')
-
 data_files = ['recursive: src *.tmpl *.txt LICENSE README TODO CHANGES',]
 
 if not os.getenv('CHEETAH_INSTALL_WITHOUT_SETUPTOOLS'):
diff --git a/bin/.gitattributes b/bin/.gitattributes
deleted file mode 100644
index 5bebad2..0000000
--- a/bin/.gitattributes
+++ /dev/null
@@ -1 +0,0 @@
-cheetah.bat -crlf
diff --git a/bin/cheetah.bat b/bin/cheetah.bat
deleted file mode 100644
index 3f6cf2a..0000000
--- a/bin/cheetah.bat
+++ /dev/null
@@ -1 +0,0 @@
-@"%~dp0..\python" "%~dpn0" %*

diff --git a/cheetah/Tests/Test.py b/cheetah/Tests/Test.py
index fe97ff4..eb12cc8 100755
--- a/cheetah/Tests/Test.py
+++ b/cheetah/Tests/Test.py
@@ -19,6 +19,7 @@ import SyntaxAndOutput
 import NameMapper
 import Template
 import CheetahWrapper
+import Cheps
 import Regressions
 import Unicode
 
@@ -28,6 +29,7 @@ suites = [
    unittest.findTestCases(Template),
    unittest.findTestCases(Regressions),
    unittest.findTestCases(Unicode),
+   unittest.findTestCases(Cheps),
 ]
 
 if not sys.platform.startswith('java'):