diff options
| author | Ezio Melotti <devnull@localhost> | 2011-10-02 12:47:10 +0300 |
|---|---|---|
| committer | Ezio Melotti <devnull@localhost> | 2011-10-02 12:47:10 +0300 |
| commit | f87611385be000c82393d919f3ec843982123647 (patch) | |
| tree | 680cfc53cb2139aeab4150fdbdc04a67b6d51ea1 /Python/errors.c | |
| parent | 91b7a110531812ee61ccb4f7c78affb4809424e5 (diff) | |
| parent | d3306a9435571f33b579e1ea6663b96f8147aa35 (diff) | |
| download | cpython-f87611385be000c82393d919f3ec843982123647.tar.gz | |
#13076: merge 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) |