Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Revert r81171 (posix_listdir(), posix_readlink(): avoid temporary PyBytes object) 

PyUnicode_DecodeFSDefault*() doesn't use surrogateescape error handler, and so
PyUnicode_FromEncodedObject(v, Py_FileSystemDefaultEncoding, "surrogateescape")
cannot be replaced by PyUnicode_DecodeFSDefault().

It's a bad idea to try to fix surrogates things in Python 3.1...
This commit is contained in:
Victor Stinner 2010-05-14 18:07:39 +00:00
parent 26a968d8fe
commit 203406c368
1 changed files with 38 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
Modules/posixmodule.c
View File

@ -2515,17 +2515,33 @@ posix_listdir(PyObject *self, PyObject *args)
(NAMLEN(ep) == 1 || (NAMLEN(ep) == 1 ||
(ep->d_name[1] == '.' && NAMLEN(ep) == 2))) (ep->d_name[1] == '.' && NAMLEN(ep) == 2)))
continue; continue;
if (arg_is_unicode) v = PyBytes_FromStringAndSize(ep->d_name, NAMLEN(ep));
v = PyUnicode_DecodeFSDefaultAndSize(ep->d_name, NAMLEN(ep));
else
v = PyBytes_FromStringAndSize(ep->d_name, NAMLEN(ep));
if (v == NULL) { if (v == NULL) {
Py_CLEAR(d); Py_DECREF(d);
d = NULL;
break; break;
} }
if (arg_is_unicode) {
PyObject *w;
w = PyUnicode_FromEncodedObject(v,
Py_FileSystemDefaultEncoding,
"surrogateescape");
Py_DECREF(v);
if (w != NULL)
v = w;
else {
/* Encoding failed to decode ASCII bytes.
Raise exception. */
Py_DECREF(d);
d = NULL;
break;
}
}
if (PyList_Append(d, v) != 0) { if (PyList_Append(d, v) != 0) {
Py_DECREF(v); Py_DECREF(v);
Py_CLEAR(d); Py_DECREF(d);
d = NULL;
break; break;
} }
Py_DECREF(v); Py_DECREF(v);
@ -4660,10 +4676,22 @@ posix_readlink(PyObject *self, PyObject *args)
return posix_error_with_allocated_filename(opath); return posix_error_with_allocated_filename(opath);
release_bytes(opath); release_bytes(opath);
if (arg_is_unicode) v = PyBytes_FromStringAndSize(buf, n);
return PyUnicode_DecodeFSDefaultAndSize(buf, n); if (arg_is_unicode) {
else PyObject *w;
return PyBytes_FromStringAndSize(buf, n);
w = PyUnicode_FromEncodedObject(v,
Py_FileSystemDefaultEncoding,
"surrogateescape");
if (w != NULL) {
Py_DECREF(v);
v = w;
}
else {
v = NULL;
}
}
return v;
} }
#endif /* HAVE_READLINK */ #endif /* HAVE_READLINK */