Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Backed out changeset 8dc144e47252

This commit is contained in:
Serhiy Storchaka 2016-04-06 23:02:25 +03:00
parent 026110f0a2
commit aaf553bac4
1 changed files with 2 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
Modules/posixmodule.c
View File

@ -884,11 +884,11 @@ path_converter(PyObject *o, void *p)
#endif
}
else if (PyObject_CheckBuffer(o)) {
#ifdef MS_WINDOWS
# ifdef MS_WINDOWS
if (win32_warn_bytes_api()) {
return 0;
}
#endif
# endif
bytes = PyBytes_FromObject(o);
if (!bytes) {
return 0;
@ -905,30 +905,6 @@ path_converter(PyObject *o, void *p)
return 1;
}
else {
PyObject *pathattr;
_Py_IDENTIFIER(path);
pathattr = _PyObject_GetAttrId(o, &PyId_path);
if (pathattr == NULL) {
PyErr_Clear();
}
else if (PyUnicode_Check(pathattr) || PyObject_CheckBuffer(pathattr)) {
if (!path_converter(pathattr, path)) {
Py_DECREF(pathattr);
return 0;
}
if (path->cleanup == NULL) {
path->cleanup = pathattr;
}
else {
Py_DECREF(pathattr);
}
return Py_CLEANUP_SUPPORTED;
}
else {
Py_DECREF(pathattr);
}
PyErr_Format(PyExc_TypeError, "%s%s%s should be %s, not %.200s",
path->function_name ? path->function_name : "",
path->function_name ? ": " : "",