[Python-checkins] r69904 - in python/branches/py3k: Lib/distutils/tests/test_bdist_dumb.py Lib/distutils/tests/test_version.py

Mon Feb 23 13:47:55 CET 2009

Author: tarek.ziade
Date: Mon Feb 23 13:47:55 2009
New Revision: 69904
Log:
Merged revisions 69902 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/trunk
........
 r69902 | tarek.ziade | 2009年02月23日 13:41:29 +0100 (2009年2月23日) | 1 line
 
 more test coverage
........
Added:
 python/branches/py3k/Lib/distutils/tests/test_bdist_dumb.py
 - copied unchanged from r69902, /python/trunk/Lib/distutils/tests/test_bdist_dumb.py
 python/branches/py3k/Lib/distutils/tests/test_version.py
 - copied, changed from r69902, /python/trunk/Lib/distutils/tests/test_version.py
Modified:
 python/branches/py3k/ (props changed)
Copied: python/branches/py3k/Lib/distutils/tests/test_version.py (from r69902, /python/trunk/Lib/distutils/tests/test_version.py)
==============================================================================

--- /python/trunk/Lib/distutils/tests/test_version.py	(original)
+++ python/branches/py3k/Lib/distutils/tests/test_version.py	Mon Feb 23 13:47:55 2009
@@ -33,7 +33,7 @@
 
 for v1, v2, wanted in versions:
 try:
- res = StrictVersion(v1).__cmp__(StrictVersion(v2))
+ res = StrictVersion(v1)._cmp(StrictVersion(v2))
 except ValueError:
 if wanted is ValueError:
 continue
@@ -58,7 +58,7 @@
 
 
 for v1, v2, wanted in versions:
- res = LooseVersion(v1).__cmp__(LooseVersion(v2))
+ res = LooseVersion(v1)._cmp(LooseVersion(v2))
 self.assertEquals(res, wanted,
 'cmp(%s, %s) should be %s, got %s' %
 (v1, v2, wanted, res))
