summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2009-12-24 22:56:20 (GMT)
committerEzio Melotti <ezio.melotti@gmail.com>2009-12-24 22:56:20 (GMT)
commit85d30593a8e15edbc9fabf86fa8b58dcf040fdcf (patch)
treed844bf5097c51df94468a2f425a5d0fd088b4b65
parent39159e143c3e97b864f9af61698cd80b53685c1c (diff)
downloadcpython-85d30593a8e15edbc9fabf86fa8b58dcf040fdcf.zip
cpython-85d30593a8e15edbc9fabf86fa8b58dcf040fdcf.tar.gz
cpython-85d30593a8e15edbc9fabf86fa8b58dcf040fdcf.tar.bz2
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 ........
-rw-r--r--Lib/test/test_exceptions.py8
1 files changed, 3 insertions, 5 deletions
diff --git a/Lib/test/test_exceptions.py b/Lib/test/test_exceptions.py
index 89e6ebb..404b5d1 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