diff options
author | Serhiy Storchaka <storchaka@gmail.com> | 2016-04-06 20:02:25 (GMT) |
---|---|---|
committer | Serhiy Storchaka <storchaka@gmail.com> | 2016-04-06 20:02:25 (GMT) |
commit | aaf553bac4124cda748b68caf7d501fd5b574046 (patch) | |
tree | 38d242da82554928d8382bb69166508f949252f6 /Modules/posixmodule.c | |
parent | 026110f0a2ce027a781e429ee9a0ed14f9b2bc4a (diff) | |
download | cpython-aaf553bac4124cda748b68caf7d501fd5b574046.zip cpython-aaf553bac4124cda748b68caf7d501fd5b574046.tar.gz cpython-aaf553bac4124cda748b68caf7d501fd5b574046.tar.bz2 |
Backed out changeset 8dc144e47252
Diffstat (limited to 'Modules/posixmodule.c')
-rw-r--r-- | Modules/posixmodule.c | 28 |
1 files changed, 2 insertions, 26 deletions
diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c index bc41d93..e6704ac 100644 --- a/Modules/posixmodule.c +++ b/Modules/posixmodule.c @@ -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 ? ": " : "", |