Skip to content
Permalink
Browse files

Issue #13560: os.strerror() now uses the current locale encoding inst…

…ead of UTF-8
  • Loading branch information...
Victor Stinner
Victor Stinner committed Dec 17, 2011
1 parent f2ea71f commit 1f33f2b0c381337d5991c227652d65eadd168209
Showing with 35 additions and 20 deletions.
  1. +3 −0 Misc/NEWS
  2. +1 −1 Modules/posixmodule.c
  3. +2 −3 Modules/socketmodule.c
  4. +20 −8 Objects/unicodeobject.c
  5. +9 −8 Python/errors.c
@@ -419,6 +419,9 @@ Core and Builtins
Library
-------

- Issue #13560: os.strerror() now uses the current locale encoding instead of
UTF-8.

- Issue #13560: Add PyUnicode_DecodeLocale(), PyUnicode_DecodeLocaleAndSize()
and PyUnicode_EncodeLocale() functions to the C API to decode/encode from/to
the current locale encoding.
@@ -7891,7 +7891,7 @@ posix_strerror(PyObject *self, PyObject *args)
"strerror() argument out of range");
return NULL;
}
return PyUnicode_FromString(message);
return PyUnicode_DecodeLocale(message, 1);
}


@@ -4032,9 +4032,8 @@ gethost_common(struct hostent *h, struct sockaddr *addr, int alen, int af)

if (h->h_addrtype != af) {
/* Let's get real error message to return */
PyErr_SetString(PyExc_OSError,
(char *)strerror(EAFNOSUPPORT));

errno = EAFNOSUPPORT;
PyErr_SetFromErrno(PyExc_OSError);
return NULL;
}

@@ -3132,6 +3132,7 @@ PyUnicode_EncodeLocale(PyObject *unicode, int surrogateescape)
wchar_t *wstr;
PyObject *bytes = NULL;
char *errmsg;
PyObject *reason;
PyObject *exc;
size_t error_pos;

@@ -3193,17 +3194,28 @@ PyUnicode_EncodeLocale(PyObject *unicode, int surrogateescape)
encode_error:
errmsg = strerror(errno);
assert(errmsg != NULL);
if (errmsg == NULL)
errmsg = "wcstombs() encountered an unencodable wide character";
PyMem_Free(wstr);
Py_XDECREF(bytes);

exc = NULL;
raise_encode_exception(&exc,
"locale", unicode,
error_pos, error_pos+1,
errmsg);
Py_XDECREF(exc);
if (errmsg != NULL)
reason = PyUnicode_DecodeLocale(errmsg, 1);
else
reason = PyUnicode_FromString(
"wcstombs() encountered an unencodable "
"wide character");
if (reason == NULL)
return NULL;

exc = PyObject_CallFunction(PyExc_UnicodeEncodeError, "sOnnO",
"locale", unicode,
(Py_ssize_t)error_pos,
(Py_ssize_t)(error_pos+1),
reason);
Py_DECREF(reason);
if (exc != NULL) {
PyCodec_StrictErrors(exc);
Py_XDECREF(exc);
}
return NULL;
}

@@ -343,9 +343,7 @@ PyErr_SetFromErrnoWithFilenameObject(PyObject *exc, PyObject *filenameObject)
PyObject *message;
PyObject *v, *args;
int i = errno;
#ifndef MS_WINDOWS
char *s;
#else
#ifdef MS_WINDOWS
WCHAR *s_buf = NULL;
#endif /* Unix/Windows */

@@ -355,11 +353,14 @@ PyErr_SetFromErrnoWithFilenameObject(PyObject *exc, PyObject *filenameObject)
#endif

#ifndef MS_WINDOWS
if (i == 0)
s = "Error"; /* Sometimes errno didn't get set */
else
s = strerror(i);
message = PyUnicode_DecodeUTF8(s, strlen(s), "ignore");
if (i != 0) {
char *s = strerror(i);
message = PyUnicode_DecodeLocale(s, 1);
}
else {
/* Sometimes errno didn't get set */
message = PyUnicode_FromString("Error");
}
#else
if (i == 0)
message = PyUnicode_FromString("Error"); /* Sometimes errno didn't get set */

0 comments on commit 1f33f2b

Please sign in to comment.
You can’t perform that action at this time.