Author: eric.smith Date: Sat Oct 31 18:08:48 2009 New Revision: 75997 Log: Merged revisions 75995 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r75995 | eric.smith | 2009-10-31 13:07:17 -0400 (Sat, 31 Oct 2009) | 1 line Improved test for a deprecation warning. ........ Modified: python/branches/py3k/ (props changed) python/branches/py3k/Lib/test/test_ascii_formatd.py Modified: python/branches/py3k/Lib/test/test_ascii_formatd.py ============================================================================== --- python/branches/py3k/Lib/test/test_ascii_formatd.py (original) +++ python/branches/py3k/Lib/test/test_ascii_formatd.py Sat Oct 31 18:08:48 2009 @@ -20,8 +20,7 @@ c_double(10.0)) self.assertEqual(buf.value, b'+10.0000000000') - self.assertEqual(str(w.message), 'PyOS_ascii_formatd is deprecated, ' - 'use PyOS_double_to_string instead') + self.assertEqual(w.category, DeprecationWarning) class FormatTests(unittest.TestCase): # ensure that, for the restricted set of format codes,