[Python-checkins] r77048 - in python/branches/release31-maint: Lib/test/test_exceptions.py

[ezio.melotti]

Author: ezio.melotti
Date: Thu Dec 24 23:56:20 2009
New Revision: 77048

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


Modified:
   python/branches/release31-maint/   (props changed)
   python/branches/release31-maint/Lib/test/test_exceptions.py

Modified: python/branches/release31-maint/Lib/test/test_exceptions.py
==============================================================================
--- python/branches/release31-maint/Lib/test/test_exceptions.py	(original)
+++ python/branches/release31-maint/Lib/test/test_exceptions.py	Thu Dec 24 23:56:20 2009
@@ -399,13 +399,11 @@
                 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