Recorded merge of revisions 78582 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r78582 | florent.xicluna | 2010-03-02 17:00:00 +0100 (mar, 02 mar 2010) | 2 lines

  Refactor test_dict using assertRaises.
........