mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-01 10:45:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 15

Backed out changeset 8dc144e47252

Browse source
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
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 #endif
} }
else if (PyObject_CheckBuffer(o)) { else if (PyObject_CheckBuffer(o)) {
#ifdef MS_WINDOWS # ifdef MS_WINDOWS
if (win32_warn_bytes_api()) { if (win32_warn_bytes_api()) {
return 0; return 0;
} }
#endif # endif
bytes = PyBytes_FromObject(o); bytes = PyBytes_FromObject(o);
if (!bytes) { if (!bytes) {
return 0; return 0;
@ -905,30 +905,6 @@ path_converter(PyObject *o, void *p)
return 1; return 1;
} }
else { 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", PyErr_Format(PyExc_TypeError, "%s%s%s should be %s, not %.200s",
path->function_name ? path->function_name : "", path->function_name ? path->function_name : "",
path->function_name ? ": " : "", path->function_name ? ": " : "",