[Python-checkins] r78521 - in python/branches/release31-maint: Doc/library/unittest.rst

[gregory.p.smith]

Author: gregory.p.smith
Date: Sun Feb 28 23:01:02 2010
New Revision: 78521

Log:
(really issue7832, not 7030)

Merged revisions 77998 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r77998 | michael.foord | 2010-02-05 12:54:27 -0800 (Fri, 05 Feb 2010) | 9 lines
  
  Merged revisions 77997 via svnmerge from 
  svn+ssh://pythondev@svn.python.org/python/trunk
  
  ........
    r77997 | michael.foord | 2010-02-05 20:52:14 +0000 (Fri, 05 Feb 2010) | 1 line
    
    Closes issue 7030.
  ........
................


Modified:
   python/branches/release31-maint/   (props changed)
   python/branches/release31-maint/Doc/library/unittest.rst

Modified: python/branches/release31-maint/Doc/library/unittest.rst
==============================================================================
--- python/branches/release31-maint/Doc/library/unittest.rst	(original)
+++ python/branches/release31-maint/Doc/library/unittest.rst	Sun Feb 28 23:01:02 2010
@@ -729,12 +729,16 @@
       .. versionadded:: 3.1
 
 
-   .. method:: assertSameElements(expected, actual, msg=None)
+   .. method:: assertSameElements(actual, expected, msg=None)
 
       Test that sequence *expected* contains the same elements as *actual*,
       regardless of their order. When they don't, an error message listing
       the differences between the sequences will be generated.
 
+      Duplicate elements are ignored when comparing *actual* and *expected*.
+      It is the equivalent of ``assertEqual(set(expected), set(actual))``
+      but it works with sequences of unhashable objects as well.
+
       If specified *msg* will be used as the error message on failure.
 
       .. versionadded:: 3.1