[Python-checkins] r69033 - in python/branches/release30-maint: Lib/unittest.py
mark.dickinson
python-checkins at python.org
Tue Jan 27 21:28:36 CET 2009
Author: mark.dickinson
Date: Tue Jan 27 21:28:36 2009
New Revision: 69033
Log:
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
........
Modified:
python/branches/release30-maint/ (props changed)
python/branches/release30-maint/Lib/unittest.py
Modified: python/branches/release30-maint/Lib/unittest.py
==============================================================================
--- python/branches/release30-maint/Lib/unittest.py (original)
+++ python/branches/release30-maint/Lib/unittest.py Tue Jan 27 21:28:36 2009
@@ -630,14 +630,18 @@
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 findTestCases(module, prefix='test', sortUsing=cmp, suiteClass=TestSuite):
- return _makeLoader(prefix, sortUsing, suiteClass).loadTestsFromModule(module)
+def makeSuite(testCaseClass, prefix='test', sortUsing=three_way_cmp,
+ suiteClass=TestSuite):
+ return _makeLoader(prefix, sortUsing, suiteClass).loadTestsFromTestCase(
+ testCaseClass)
+
+def findTestCases(module, prefix='test', sortUsing=three_way_cmp,
+ suiteClass=TestSuite):
+ return _makeLoader(prefix, sortUsing, suiteClass).loadTestsFromModule(
+ module)
##############################################################################
More information about the Python-checkins
mailing list