From: Serhiy Storchaka <storchaka@gmail.com>
Date: Wed, 6 Apr 2016 20:02:25 +0000 (+0300)
Subject: Backed out changeset 8dc144e47252
X-Git-Tag: v3.6.0a1~263
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=aaf553bac4124cda748b68caf7d501fd5b574046;p=thirdparty%2FPython%2Fcpython.git

Backed out changeset 8dc144e47252
---

diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
index bc41d935b698..e6704aced322 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 ? ": "                : "",