attempt to fix encoding error on osx/py3 https://travis-ci.org/giampaolo/psutil/jobs/104073357

1 files changed, 9 insertions, 0 deletions

diff --git a/psutil/_psutil_osx.c b/psutil/_psutil_osx.c
index bea74f7d..b9578864 100644
--- a/psutil/_psutil_osx.c
+++ b/psutil/_psutil_osx.c
@@ -158,7 +158,16 @@ psutil_proc_cwd(PyObject *self, PyObject *args) {
     {
         return NULL;
     }
+
+#if PY_MAJOR_VERSION >= 3
+    return PyUnicode_Decode(
+        pathinfo.pvi_cdir.vip_path,
+        sizeof(pathinfo.pvi_cdir.vip_path),
+        Py_FileSystemDefaultEncoding,
+        "surrogateescape");
+#else
     return Py_BuildValue("s", pathinfo.pvi_cdir.vip_path);
+#endif
 }