mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-21 14:12:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Simplify PyUnicode_FSConverter(): remove reference to PyByteArray

Browse source 
PyByteArray is no more supported
This commit is contained in:
Victor Stinner 2010-04-30 00:22:08 +00:00
parent 8130290d42
commit 0ea2a468e3
1 changed files with 3 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Objects/unicodeobject.c
View file

@ -1638,7 +1638,7 @@ PyUnicode_FSConverter(PyObject* arg, void* addr)
arg = PyUnicode_FromObject(arg); arg = PyUnicode_FromObject(arg);
if (!arg) if (!arg)
return 0; return 0;
output = PyUnicode_AsEncodedObject(arg, output = PyUnicode_AsEncodedObject(arg,
Py_FileSystemDefaultEncoding, Py_FileSystemDefaultEncoding,
"surrogateescape"); "surrogateescape");
Py_DECREF(arg); Py_DECREF(arg);
@ -1650,14 +1650,8 @@ PyUnicode_FSConverter(PyObject* arg, void* addr)
return 0; return 0;
} }
} }
if (PyBytes_Check(output)) { size = PyBytes_GET_SIZE(output);
size = PyBytes_GET_SIZE(output); data = PyBytes_AS_STRING(output);
data = PyBytes_AS_STRING(output);
}
else {
size = PyByteArray_GET_SIZE(output);
data = PyByteArray_AS_STRING(output);
}
if (size != strlen(data)) { if (size != strlen(data)) {
PyErr_SetString(PyExc_TypeError, "embedded NUL character"); PyErr_SetString(PyExc_TypeError, "embedded NUL character");
Py_DECREF(output); Py_DECREF(output);