From 30147710e8d6b2b5aebcf6f774fe289a4918958c Mon Sep 17 00:00:00 2001 From: Richard Oudkerk Date: Tue, 28 Aug 2012 19:33:26 +0100 Subject: Issue #15784: Modify OSError.__str__() to better distinguish between errno error numbers and Windows error numbers. --- Objects/exceptions.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Objects/exceptions.c') diff --git a/Objects/exceptions.c b/Objects/exceptions.c index 74bb26285e..6b04700621 100644 --- a/Objects/exceptions.c +++ b/Objects/exceptions.c @@ -1016,12 +1016,12 @@ OSError_str(PyOSErrorObject *self) #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 -- cgit v1.2.1