From 0ea2a468e31b3ec20ae4281d9c28d1f5db7912d9 Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Fri, 30 Apr 2010 00:22:08 +0000 Subject: [PATCH] Simplify PyUnicode_FSConverter(): remove reference to PyByteArray PyByteArray is no more supported --- Objects/unicodeobject.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c index 3851008a88..369306e368 100644 --- a/Objects/unicodeobject.c +++ b/Objects/unicodeobject.c @@ -1638,7 +1638,7 @@ PyUnicode_FSConverter(PyObject* arg, void* addr) arg = PyUnicode_FromObject(arg); if (!arg) return 0; - output = PyUnicode_AsEncodedObject(arg, + output = PyUnicode_AsEncodedObject(arg, Py_FileSystemDefaultEncoding, "surrogateescape"); Py_DECREF(arg); @@ -1650,14 +1650,8 @@ PyUnicode_FSConverter(PyObject* arg, void* addr) return 0; } } - if (PyBytes_Check(output)) { - size = PyBytes_GET_SIZE(output); - data = PyBytes_AS_STRING(output); - } - else { - size = PyByteArray_GET_SIZE(output); - data = PyByteArray_AS_STRING(output); - } + size = PyBytes_GET_SIZE(output); + data = PyBytes_AS_STRING(output); if (size != strlen(data)) { PyErr_SetString(PyExc_TypeError, "embedded NUL character"); Py_DECREF(output); -- 2.50.1