Incorporated patch 819077, from George Yoshida:

* Fixed typo in docstring for 'failUnlessAlmostEqual()'

* Removed unnecessary use of 'float()' for time values.

* Removed apparently unnecessary import of unittest. At some point in
  the distant past I believe it was necessary otherwise the 'TestCase'
  that a module saw was not the same as the 'TestCase' seen within
  'unittest', and the user's TestCase subclasses were not recognised as
  subclasses of the TestCase seen within unittest. Seems not to be
  necessary now.

diff --git a/Lib/unittest.py b/Lib/unittest.py
index d305d954b318f6e5bbb5ccba3016908f48a4da62..65674104de040477c1b629f0baf1fff2c7861ba2 100644 (file)
--- a/Lib/unittest.py
+++ b/Lib/unittest.py
@@ -46,7 +46,7 @@ SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 
 __author__ = "Steve Purcell"
 __email__ = "stephen_purcell at yahoo dot com"
-__version__ = "#Revision: 1.58 $"[11:-2]
+__version__ = "#Revision: 1.61 $"[11:-2]
 
 import time
 import sys
@@ -329,7 +329,7 @@ class TestCase:
            difference rounded to the given number of decimal places
            (default 7) and comparing to zero.
 
-           Note that decimal places (from zero) is usually not the same
+           Note that decimal places (from zero) are usually not the same
            as significant digits (measured from the most signficant digit).
         """
         if round(second-first, places) != 0:
@@ -509,19 +509,18 @@ class TestLoader:
         for part in parts:
             parent, obj = obj, getattr(obj, part)
 
-        import unittest
         if type(obj) == types.ModuleType:
             return self.loadTestsFromModule(obj)
         elif (isinstance(obj, (type, types.ClassType)) and
-              issubclass(obj, unittest.TestCase)):
+              issubclass(obj, TestCase)):
             return self.loadTestsFromTestCase(obj)
         elif type(obj) == types.UnboundMethodType:
             return parent(obj.__name__)
-        elif isinstance(obj, unittest.TestSuite):
+        elif isinstance(obj, TestSuite):
             return obj
         elif callable(obj):
             test = obj()
-            if not isinstance(test, (unittest.TestCase, unittest.TestSuite)):
+            if not isinstance(test, (TestCase, TestSuite)):
                 raise ValueError, \
                       "calling %s returned %s, not a test" % (obj,test)
             return test
@@ -674,7 +673,7 @@ class TextTestRunner:
         startTime = time.time()
         test(result)
         stopTime = time.time()
-        timeTaken = float(stopTime - startTime)
+        timeTaken = stopTime - startTime
         result.printErrors()
         self.stream.writeln(result.separator2)
         run = result.testsRun