From: Anthony Baxter <anthonybaxter@gmail.com>
Date: Wed, 5 Dec 2001 06:30:21 +0000 (+0000)
Subject: backport 1.8, 1.9
X-Git-Tag: v2.1.2c1~59
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b9be51119063bd51e796445d864b0b5bb13bf355;p=thirdparty%2FPython%2Fcpython.git

backport 1.8, 1.9
--
patch 418489 from Andrew Dalke for string format bug
--
Merged in bugfix from PyUnit CVS for problem reported by Gary Todd.
If 'unittest.py' was run from the command line with the name of a test
case class as a parameter, it failed with an ugly error. (Which was a
shame, because the documentation says you can do that.)
--
---

diff --git a/Lib/unittest.py b/Lib/unittest.py
index 72414fa3887c..480e825d5807 100644
--- a/Lib/unittest.py
+++ b/Lib/unittest.py
@@ -432,18 +432,19 @@ class TestLoader:
         for part in parts:
             obj = getattr(obj, part)
 
+        import unittest
         if type(obj) == types.ModuleType:
             return self.loadTestsFromModule(obj)
-        elif type(obj) == types.ClassType and issubclass(obj, TestCase):
+        elif type(obj) == types.ClassType and issubclass(obj, unittest.TestCase):
             return self.loadTestsFromTestCase(obj)
         elif type(obj) == types.UnboundMethodType:
             return obj.im_class(obj.__name__)
         elif callable(obj):
             test = obj()
-            if not isinstance(test, TestCase) and \
-               not isinstance(test, TestSuite):
+            if not isinstance(test, unittest.TestCase) and \
+               not isinstance(test, unittest.TestSuite):
                 raise ValueError, \
-                      "calling %s returned %s, not a test" % obj,test
+                      "calling %s returned %s, not a test" % (obj,test)
             return test
         else:
             raise ValueError, "don't know how to make test from: %s" % obj