mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-03 16:39:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Issue #26754: Undocumented support of general bytes-like objects

Browse source 
as path in compile() and similar functions is now deprecated.
This commit is contained in:
Serhiy Storchaka 2016-08-06 23:29:29 +03:00
parent d73c31899e
commit febc332056
7 changed files with 34 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Objects/unicodeobject.c
View file

@ -3837,7 +3837,13 @@ PyUnicode_FSDecoder(PyObject* arg, void* addr)
output = arg;
Py_INCREF(output);
}
else if (PyObject_CheckBuffer(arg)) {
else if (PyBytes_Check(arg) || PyObject_CheckBuffer(arg)) {
if (!PyBytes_Check(arg) &&
PyErr_WarnFormat(PyExc_DeprecationWarning, 1,
"path should be string or bytes, not %.200s",
Py_TYPE(arg)->tp_name)) {
return 0;
}
arg = PyBytes_FromObject(arg);
if (!arg)
return 0;
@ -3846,11 +3852,6 @@ PyUnicode_FSDecoder(PyObject* arg, void* addr)
Py_DECREF(arg);
if (!output)
return 0;
if (!PyUnicode_Check(output)) {
Py_DECREF(output);
PyErr_SetString(PyExc_TypeError, "decoder failed to return unicode");
return 0;
}
}
else {
PyErr_Format(PyExc_TypeError,