Initial import (to fix bug in 2.2 and 2.3)

This commit is contained in:
Jeremy Fincher 2003-04-04 08:26:59 +00:00
parent 8d2ac8c359
commit d4d81f09dc

View File

@ -46,7 +46,7 @@ SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
__author__ = "Steve Purcell" __author__ = "Steve Purcell"
__email__ = "stephen_purcell at yahoo dot com" __email__ = "stephen_purcell at yahoo dot com"
__version__ = "$Revision$"[11:-2] __version__ = "#Revision: 1.43 $"[11:-2]
import time import time
import sys import sys
@ -212,7 +212,7 @@ class TestCase:
try: try:
testMethod() testMethod()
ok = 1 ok = 1
except self.failureException: except self.failureException, e:
result.addFailure(self, self.__exc_info()) result.addFailure(self, self.__exc_info())
except KeyboardInterrupt: except KeyboardInterrupt:
raise raise
@ -282,7 +282,7 @@ class TestCase:
"""Fail if the two objects are unequal as determined by the '!=' """Fail if the two objects are unequal as determined by the '!='
operator. operator.
""" """
if first != second: if not first == second:
raise self.failureException, \ raise self.failureException, \
(msg or '%s != %s' % (`first`, `second`)) (msg or '%s != %s' % (`first`, `second`))
@ -447,6 +447,7 @@ class TestLoader:
for part in parts: for part in parts:
obj = getattr(obj, part) obj = getattr(obj, part)
import unittest
if type(obj) == types.ModuleType: if type(obj) == types.ModuleType:
return self.loadTestsFromModule(obj) return self.loadTestsFromModule(obj)
elif type(obj) == types.ClassType and issubclass(obj, unittest.TestCase): elif type(obj) == types.ClassType and issubclass(obj, unittest.TestCase):
@ -720,4 +721,3 @@ main = TestProgram
if __name__ == "__main__": if __name__ == "__main__":
main(module=None) main(module=None)
# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78: