From 549a7c608347d68101574373d05147f9b99ebc8f Mon Sep 17 00:00:00 2001 From: Mark Dickinson Date: Tue, 27 Jan 2009 20:28:36 +0000 Subject: [PATCH] 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 ........ --- Lib/unittest.py | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/Lib/unittest.py b/Lib/unittest.py index b6abc2e0d85d..15933a149522 100644 --- 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) ############################################################################## -- 2.47.3