[Python-checkins] r86855 - in python/branches/py3k: Doc/library/unittest.rst Lib/unittest/case.py

[raymond.hettinger]

Author: raymond.hettinger
Date: Mon Nov 29 02:38:25 2010
New Revision: 86855

Log:
Do not add an obsolete unittest name to Py3.2.

Modified:
   python/branches/py3k/Doc/library/unittest.rst
   python/branches/py3k/Lib/unittest/case.py

Modified: python/branches/py3k/Doc/library/unittest.rst
==============================================================================
--- python/branches/py3k/Doc/library/unittest.rst	(original)
+++ python/branches/py3k/Doc/library/unittest.rst	Mon Nov 29 02:38:25 2010
@@ -1144,13 +1144,6 @@
 
       .. versionadded:: 3.2
 
-   .. method:: assertItemsEqual(actual, expected, msg=None)
-
-      Outdated name for :meth:`assertCountEqual`, kept for compatibility
-      with Python 2.7.
-
-      .. versionadded:: 3.2
-
    .. method:: assertSameElements(actual, expected, msg=None)
 
       Test that sequence *expected* contains the same elements as *actual*,

Modified: python/branches/py3k/Lib/unittest/case.py
==============================================================================
--- python/branches/py3k/Lib/unittest/case.py	(original)
+++ python/branches/py3k/Lib/unittest/case.py	Mon Nov 29 02:38:25 2010
@@ -1029,9 +1029,6 @@
             standardMsg = '\n'.join(errors)
             self.fail(self._formatMessage(msg, standardMsg))
 
-    # Old name for assertCountEqual()
-    assertItemsEqual = assertCountEqual
-
     def assertMultiLineEqual(self, first, second, msg=None):
         """Assert that two multi-line strings are equal."""
         self.assertIsInstance(first, str, 'First argument is not a string')