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.
........

diff --git a/Doc/library/unittest.rst b/Doc/library/unittest.rst
index 6023c2495cb6326f97c6776ef28ded9cc220cea6..4adc1063ce2c4bc9c1e1f54f15032c474a6b77ac 100644 (file)
--- a/Doc/library/unittest.rst
+++ b/Doc/library/unittest.rst
@@ -801,12 +801,16 @@ Test cases
       .. 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