diff options
| author | Ezio Melotti <ezio.melotti@gmail.com> | 2011-10-10 00:31:00 +0300 |
|---|---|---|
| committer | Ezio Melotti <ezio.melotti@gmail.com> | 2011-10-10 00:31:00 +0300 |
| commit | 40628ad66dfb2406d245e34969dd028a33dc5b46 (patch) | |
| tree | a01c89714d2252836100d7ef266beae25ece70ba /Python/errors.c | |
| parent | 510869614f47eb89e5f00316e4791a94af14c012 (diff) | |
| parent | bc8b3ddaa66840bd5d3595f605505c81bbb6631b (diff) | |
| download | cpython-40628ad66dfb2406d245e34969dd028a33dc5b46.tar.gz | |
Merge whatsnew fixes with 3.2.
Diffstat (limited to 'Python/errors.c')
| -rw-r--r-- | Python/errors.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Python/errors.c b/Python/errors.c index 5a9a624279..149151ebfa 100644 --- a/Python/errors.c +++ b/Python/errors.c @@ -395,7 +395,7 @@ PyErr_SetFromErrnoWithFilenameObject(PyObject *exc, PyObject *filenameObject) /* remove trailing cr/lf and dots */ while (len > 0 && (s_buf[len-1] <= L' ' || s_buf[len-1] == L'.')) s_buf[--len] = L'\0'; - message = PyUnicode_FromUnicode(s_buf, len); + message = PyUnicode_FromWideChar(s_buf, len); } } } @@ -487,7 +487,7 @@ PyObject *PyErr_SetExcFromWindowsErrWithFilenameObject( /* remove trailing cr/lf and dots */ while (len > 0 && (s_buf[len-1] <= L' ' || s_buf[len-1] == L'.')) s_buf[--len] = L'\0'; - message = PyUnicode_FromUnicode(s_buf, len); + message = PyUnicode_FromWideChar(s_buf, len); } if (message == NULL) |