From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Thu, 24 Dec 2009 22:56:20 +0000 (+0000)
Subject: Merged revisions 77047 via svnmerge from
X-Git-Tag: v3.1.2rc1~223
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=85d30593a8e15edbc9fabf86fa8b58dcf040fdcf;p=thirdparty%2FPython%2Fcpython.git

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

........
  r77047 | ezio.melotti | 2009-12-25 00:54:06 +0200 (Fri, 25 Dec 2009) | 1 line

  Remove test for unicode(e) converted to str(e) by 2to3
........
---

diff --git a/Lib/test/test_exceptions.py b/Lib/test/test_exceptions.py
index 89e6ebb27b00..404b5d157032 100644
--- a/Lib/test/test_exceptions.py
+++ b/Lib/test/test_exceptions.py
@@ -399,13 +399,11 @@ class ExceptionTests(unittest.TestCase):
                 return -1
         self.assertRaises(RuntimeError, g)
 
-    def testUnicodeStrUsage(self):
-        # Make sure both instances and classes have a str and unicode
-        # representation.
+    def test_str(self):
+        # Make sure both instances and classes have a str representation.
         self.assertTrue(str(Exception))
-        self.assertTrue(str(Exception))
-        self.assertTrue(str(Exception('a')))
         self.assertTrue(str(Exception('a')))
+        self.assertTrue(str(Exception('a', 'b')))
 
     def testExceptionCleanupNames(self):
         # Make sure the local variable bound to the exception instance by