patch 7.4.1864

Problem:    Python: encoding error with Python 2.
Solution:   Use "getcwdu" instead of "getcwd". (Ken Takata)

diff --git a/src/if_py_both.h b/src/if_py_both.h
index ce8bacd852d8607228dad1149089394d217a47c9..50fd687d96cb2630613a3a5b6ec8f3cecf683c41 100644 (file)
--- a/src/if_py_both.h
+++ b/src/if_py_both.h
@@ -6770,8 +6770,13 @@ populate_module(PyObject *m)
        return -1;
     ADD_OBJECT(m, "os", other_module);
 
+#if PY_MAJOR_VERSION >= 3
     if (!(py_getcwd = PyObject_GetAttrString(other_module, "getcwd")))
        return -1;
+#else
+    if (!(py_getcwd = PyObject_GetAttrString(other_module, "getcwdu")))
+       return -1;
+#endif
     ADD_OBJECT(m, "_getcwd", py_getcwd)
 
     if (!(py_chdir = PyObject_GetAttrString(other_module, "chdir")))

diff --git a/src/version.c b/src/version.c
index 0d234a5d3d262c3e7f4c0b03f2e495d15091ae35..a934fe72e62ba3f964b814ced566f4a6fe81a489 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -753,6 +753,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1864,
 /**/
     1863,
 /**/