diff options
| author | Victor Stinner <victor.stinner@haypocalc.com> | 2010-05-14 16:35:39 (GMT) |
|---|---|---|
| committer | Victor Stinner <victor.stinner@haypocalc.com> | 2010-05-14 16:35:39 (GMT) |
| commit | a45598a035a3a68e19e7aebff7c5ddf003517363 (patch) | |
| tree | 88b48472e99b7c574d8ca79bdad0288622d57616 /Modules | |
| parent | 77c3862417552902425d1ccb1ace468d81dab36b (diff) | |
| download | cpython-a45598a035a3a68e19e7aebff7c5ddf003517363.zip cpython-a45598a035a3a68e19e7aebff7c5ddf003517363.tar.gz cpython-a45598a035a3a68e19e7aebff7c5ddf003517363.tar.bz2 | |
posix_listdir(), posix_readlink(): avoid temporary PyBytes object
Use directly PyUnicode_DecodeFSDefaultAndSize() instead of
PyBytes_FromStringAndSize() + PyUnicode_FromEncodedObject() if the argument is
unicode.
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/posixmodule.c | 48 |
1 files changed, 10 insertions, 38 deletions
diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c index 8aea640..8ea2b97 100644 --- a/Modules/posixmodule.c +++ b/Modules/posixmodule.c @@ -2364,33 +2364,17 @@ posix_listdir(PyObject *self, PyObject *args) (NAMLEN(ep) == 1 || (ep->d_name[1] == '.' && NAMLEN(ep) == 2))) continue; - v = PyBytes_FromStringAndSize(ep->d_name, NAMLEN(ep)); + if (arg_is_unicode) + v = PyUnicode_DecodeFSDefaultAndSize(ep->d_name, NAMLEN(ep)); + else + v = PyBytes_FromStringAndSize(ep->d_name, NAMLEN(ep)); if (v == NULL) { - Py_DECREF(d); - d = NULL; + Py_CLEAR(d); 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) { Py_DECREF(v); - Py_DECREF(d); - d = NULL; + Py_CLEAR(d); break; } Py_DECREF(v); @@ -4605,22 +4589,10 @@ posix_readlink(PyObject *self, PyObject *args) return posix_error_with_allocated_filename(opath); Py_DECREF(opath); - v = PyBytes_FromStringAndSize(buf, n); - if (arg_is_unicode) { - PyObject *w; - - w = PyUnicode_FromEncodedObject(v, - Py_FileSystemDefaultEncoding, - "surrogateescape"); - if (w != NULL) { - Py_DECREF(v); - v = w; - } - else { - v = NULL; - } - } - return v; + if (arg_is_unicode) + return PyUnicode_DecodeFSDefaultAndSize(buf, n); + else + return PyBytes_FromStringAndSize(buf, n); } #endif /* HAVE_READLINK */ |