Merged revisions 69032 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r69032 | mark.dickinson | 2009-01-27 20:27:05 +0000 (Tue, 27 Jan 2009) | 2 lines

  Fix an occurrence of cmp that was missed in r69025
........

diff --git a/Lib/unittest.py b/Lib/unittest.py
index b6abc2e0d85d42c4978ca1fc3559acc01f209633..15933a149522589d67a0a88398263940324101eb 100644 (file)
--- a/Lib/unittest.py
+++ b/Lib/unittest.py
@@ -630,14 +630,18 @@ def _makeLoader(prefix, sortUsing, suiteClass=None):
     if suiteClass: loader.suiteClass = suiteClass
     return loader
 
-def getTestCaseNames(testCaseClass, prefix, sortUsing=cmp):
+def getTestCaseNames(testCaseClass, prefix, sortUsing=three_way_cmp):
     return _makeLoader(prefix, sortUsing).getTestCaseNames(testCaseClass)
 
-def makeSuite(testCaseClass, prefix='test', sortUsing=cmp, suiteClass=TestSuite):
-    return _makeLoader(prefix, sortUsing, suiteClass).loadTestsFromTestCase(testCaseClass)
+def makeSuite(testCaseClass, prefix='test', sortUsing=three_way_cmp,
+              suiteClass=TestSuite):
+    return _makeLoader(prefix, sortUsing, suiteClass).loadTestsFromTestCase(
+        testCaseClass)
 
-def findTestCases(module, prefix='test', sortUsing=cmp, suiteClass=TestSuite):
-    return _makeLoader(prefix, sortUsing, suiteClass).loadTestsFromModule(module)
+def findTestCases(module, prefix='test', sortUsing=three_way_cmp,
+                  suiteClass=TestSuite):
+    return _makeLoader(prefix, sortUsing, suiteClass).loadTestsFromModule(
+        module)
 
 
 ##############################################################################