summaryrefslogtreecommitdiffstats
path: root/Lib/test
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2012-08-28 22:02:18 (GMT)
committerBenjamin Peterson <benjamin@python.org>2012-08-28 22:02:18 (GMT)
commit4e07a8c9aa5275c7a8161e02fba29e8170f0c212 (patch)
tree24c276c528592a1783328dae425e938f3215eed2 /Lib/test
parent59043f96eaf5797c0a1f9058b802fcfea5d044fa (diff)
parentea62bd50a37beb6346a6819c54ffd1ae1e70545f (diff)
downloadcpython-4e07a8c9aa5275c7a8161e02fba29e8170f0c212.zip
cpython-4e07a8c9aa5275c7a8161e02fba29e8170f0c212.tar.gz
cpython-4e07a8c9aa5275c7a8161e02fba29e8170f0c212.tar.bz2
merge heads
Diffstat (limited to 'Lib/test')
-rw-r--r--Lib/test/test_exceptions.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/test/test_exceptions.py b/Lib/test/test_exceptions.py
index 55e9db3..413f4dd 100644
--- a/Lib/test/test_exceptions.py
+++ b/Lib/test/test_exceptions.py
@@ -216,14 +216,14 @@ class ExceptionTests(unittest.TestCase):
self.assertEqual(w.winerror, 3)
self.assertEqual(w.strerror, 'foo')
self.assertEqual(w.filename, 'bar')
- self.assertEqual(str(w), "[Error 3] foo: 'bar'")
+ self.assertEqual(str(w), "[WinError 3] foo: 'bar'")
# Unknown win error becomes EINVAL (22)
w = OSError(0, 'foo', None, 1001)
self.assertEqual(w.errno, 22)
self.assertEqual(w.winerror, 1001)
self.assertEqual(w.strerror, 'foo')
self.assertEqual(w.filename, None)
- self.assertEqual(str(w), "[Error 1001] foo")
+ self.assertEqual(str(w), "[WinError 1001] foo")
# Non-numeric "errno"
w = OSError('bar', 'foo')
self.assertEqual(w.errno, 'bar')