diff options
| author | Éric Araujo <merwok@netwok.org> | 2011-10-09 08:58:16 +0200 |
|---|---|---|
| committer | Éric Araujo <merwok@netwok.org> | 2011-10-09 08:58:16 +0200 |
| commit | 08445566b23e60a05193826e327472776644c2b6 (patch) | |
| tree | 0d0fd83baf7e6da48a29f3bd563f102121f03e06 /Python/errors.c | |
| parent | 65519f069449fb48568374959a0bced2e755fa63 (diff) | |
| parent | 11bfa66b3907f62467db3c84af4e2ef765ed523f (diff) | |
| download | cpython-08445566b23e60a05193826e327472776644c2b6.tar.gz | |
Merge 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) |