diff options
| author | Benjamin Peterson <benjamin@python.org> | 2012-08-28 22:02:18 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2012-08-28 22:02:18 (GMT) |
| commit | 4e07a8c9aa5275c7a8161e02fba29e8170f0c212 (patch) | |
| tree | 24c276c528592a1783328dae425e938f3215eed2 /Objects | |
| parent | 59043f96eaf5797c0a1f9058b802fcfea5d044fa (diff) | |
| parent | ea62bd50a37beb6346a6819c54ffd1ae1e70545f (diff) | |
| download | cpython-4e07a8c9aa5275c7a8161e02fba29e8170f0c212.zip cpython-4e07a8c9aa5275c7a8161e02fba29e8170f0c212.tar.gz cpython-4e07a8c9aa5275c7a8161e02fba29e8170f0c212.tar.bz2 | |
merge heads
Diffstat (limited to 'Objects')
| -rw-r--r-- | Objects/exceptions.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Objects/exceptions.c b/Objects/exceptions.c index 74bb262..6b04700 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 |