# HG changeset patch
# Parent ca54c27a9045c655ef1ad9ce248f02eb00137476

diff -r ca54c27a9045 Lib/test/test_exceptions.py
--- a/Lib/test/test_exceptions.py	Tue Aug 21 14:54:22 2012 +0100
+++ b/Lib/test/test_exceptions.py	Sat Aug 25 20:01:16 2012 +0100
@@ -216,14 +216,14 @@
             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')
diff -r ca54c27a9045 Objects/exceptions.c
--- a/Objects/exceptions.c	Tue Aug 21 14:54:22 2012 +0100
+++ b/Objects/exceptions.c	Sat Aug 25 20:01:16 2012 +0100
@@ -1016,12 +1016,12 @@
 #ifdef MS_WINDOWS
     /* If available, winerror has the priority over myerrno */
     if (self->winerror && self->filename)
-        return PyUnicode_FromFormat("[Error %S] %S: %R",
+        return PyUnicode_FromFormat("[WinError %S] %S: %R",
                                     self->winerror ? self->winerror: Py_None,
                                     self->strerror ? self->strerror: Py_None,
                                     self->filename);
     if (self->winerror && self->strerror)
-        return PyUnicode_FromFormat("[Error %S] %S",
+        return PyUnicode_FromFormat("[WinError %S] %S",
                                     self->winerror ? self->winerror: Py_None,
                                     self->strerror ? self->strerror: Py_None);
 #endif