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

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

Browse source 
as paths in os functions is now deprecated.
This commit is contained in:
Serhiy Storchaka 2016-08-06 23:22:08 +03:00
parent 43b586b951
commit d73c31899e
5 changed files with 48 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

31
Modules/posixmodule.c
View file

@ -891,7 +891,28 @@ path_converter(PyObject *o, void *p)
}
#endif
}
else if (PyBytes_Check(o)) {
#ifdef MS_WINDOWS
if (win32_warn_bytes_api()) {
return 0;
}
#endif
bytes = o;
Py_INCREF(bytes);
}
else if (PyObject_CheckBuffer(o)) {
if (PyErr_WarnFormat(PyExc_DeprecationWarning, 1,
"%s%s%s should be %s, not %.200s",
path->function_name ? path->function_name : "",
path->function_name ? ": " : "",
path->argument_name ? path->argument_name : "path",
path->allow_fd && path->nullable ? "string, bytes, integer or None" :
path->allow_fd ? "string, bytes or integer" :
path->nullable ? "string, bytes or None" :
"string or bytes",
Py_TYPE(o)->tp_name)) {
return 0;
}
#ifdef MS_WINDOWS
if (win32_warn_bytes_api()) {
return 0;
@ -946,8 +967,14 @@ path_converter(PyObject *o, void *p)
path->length = length;
path->object = o;
path->fd = -1;
path->cleanup = bytes;
return Py_CLEANUP_SUPPORTED;
if (bytes == o) {
Py_DECREF(bytes);
return 1;
}
else {
path->cleanup = bytes;
return Py_CLEANUP_SUPPORTED;
}
}
static void