[Python-checkins] r78006 - in python/branches/py3k: Lib/unittest/case.py

[michael.foord]

Author: michael.foord
Date: Sat Feb  6 00:26:29 2010
New Revision: 78006

Log:
Merged revisions 78005 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r78005 | michael.foord | 2010-02-05 23:22:37 +0000 (Fri, 05 Feb 2010) | 1 line
  
  Correction to docstring correction.
........


Modified:
   python/branches/py3k/   (props changed)
   python/branches/py3k/Lib/unittest/case.py

Modified: python/branches/py3k/Lib/unittest/case.py
==============================================================================
--- python/branches/py3k/Lib/unittest/case.py	(original)
+++ python/branches/py3k/Lib/unittest/case.py	Sat Feb  6 00:26:29 2010
@@ -403,7 +403,7 @@
                with self.assertRaises(SomeException) as cm:
                    do_something()
                the_exception = cm.exc_value
-               self.assertEquals(the_exception.error_code, 3)
+               self.assertEqual(the_exception.error_code, 3)
         """
         context = _AssertRaisesContext(excClass, self, callableObj)
         if callableObj is None: