Remove references to unittest_local_copy which is quite old and causing problems

7 files changed, 7 insertions, 11 deletions

diff --git a/cheetah/Tests/NameMapper.py b/cheetah/Tests/NameMapper.py
index 5d6b8b6..8efd6ac 100644
--- a/cheetah/Tests/NameMapper.py
+++ b/cheetah/Tests/NameMapper.py
@@ -6,7 +6,6 @@ import types
 import os
 import os.path
 
-#import unittest_local_copy as unittest
 import unittest
 from Cheetah.NameMapper import NotFound, valueForKey, \
      valueForName, valueFromSearchList, valueFromFrame, valueFromFrameOrSearchList
diff --git a/cheetah/Tests/Regressions.py b/cheetah/Tests/Regressions.py
index b5ba3d0..4d50348 100644
--- a/cheetah/Tests/Regressions.py
+++ b/cheetah/Tests/Regressions.py
@@ -3,10 +3,9 @@
 import Cheetah.NameMapper 
 import Cheetah.Template
 
-import pdb
 import sys
+import unittest
 
-import unittest_local_copy as unittest # This is just stupid
 
 majorVer, minorVer = sys.version_info[0], sys.version_info[1]
 versionTuple = (majorVer, minorVer)
diff --git a/cheetah/Tests/SyntaxAndOutput.py b/cheetah/Tests/SyntaxAndOutput.py
index 78e0cc5..e9b6cc2 100644
--- a/cheetah/Tests/SyntaxAndOutput.py
+++ b/cheetah/Tests/SyntaxAndOutput.py
@@ -23,15 +23,14 @@ from copy import deepcopy
 import os
 import os.path
 import new
-import pdb
 import warnings
+import unittest
 
 from Cheetah.NameMapper import NotFound
 from Cheetah.NameMapper import C_VERSION as NameMapper_C_VERSION
 from Cheetah.Template import Template
 from Cheetah.Parser import ParseError
 from Cheetah.Compiler import Compiler, DEFAULT_COMPILER_SETTINGS
-import unittest_local_copy as unittest
 
 class Unspecified(object):
     pass
diff --git a/cheetah/Tests/Template.py b/cheetah/Tests/Template.py
index 085180d..144ae6f 100644
--- a/cheetah/Tests/Template.py
+++ b/cheetah/Tests/Template.py
@@ -7,7 +7,7 @@ import os
 import os.path
 import tempfile
 import shutil
-import unittest_local_copy as unittest
+import unittest
 from Cheetah.Template import Template
 
 majorVer, minorVer = sys.version_info[0], sys.version_info[1]
@@ -343,7 +343,7 @@ class MultipleInheritanceSupport(TemplateTest):
                 compilerSettings={'autoImportForExtendsDirective' : False})
         template = template()
         result = template.foo()
-        print result
+        assert result == [4, 5, 1, 2, 3], (result, 'Unexpected result')
 
 
 ##################################################
diff --git a/cheetah/Tests/Test.py b/cheetah/Tests/Test.py
index db9cdbc..86341f9 100755
--- a/cheetah/Tests/Test.py
+++ b/cheetah/Tests/Test.py
@@ -11,7 +11,7 @@ TODO
 '''
 
 import sys
-import unittest_local_copy as unittest
+import unittest
 
 import SyntaxAndOutput
 import NameMapper
diff --git a/cheetah/Tests/Unicode.py b/cheetah/Tests/Unicode.py
index da59bed..e4499d9 100644
--- a/cheetah/Tests/Unicode.py
+++ b/cheetah/Tests/Unicode.py
@@ -6,11 +6,9 @@ from Cheetah import CheetahWrapper
 from Cheetah import DummyTransaction
 import imp
 import os
-import pdb
-import random
 import sys
 import tempfile
-import unittest_local_copy as unittest # This is stupid
+import unittest
 
 class CommandLineTest(unittest.TestCase):
     def createAndCompile(self, source):
diff --git a/cheetah/Tests/VerifyType.py b/cheetah/Tests/VerifyType.py
index 7cab587..a581d70 100644
--- a/cheetah/Tests/VerifyType.py
+++ b/cheetah/Tests/VerifyType.py
@@ -1,3 +1,4 @@
+#!/usr/bin/env python 
 import unittest
 
 from Cheetah.Utils import VerifyType