diff options
author | Giampaolo Rodola <g.rodola@gmail.com> | 2016-01-22 13:13:10 +0100 |
---|---|---|
committer | Giampaolo Rodola <g.rodola@gmail.com> | 2016-01-22 13:13:10 +0100 |
commit | 779c53a1ebf0f0757877bb29ce0ef644de4fbdfe (patch) | |
tree | 3a665fe60281db848d10b9eab27f5ee714eed24d | |
parent | 209c0bda4d2bcebf05c3a62451f19a2c5851083a (diff) | |
download | psutil-779c53a1ebf0f0757877bb29ce0ef644de4fbdfe.tar.gz |
attempt to fix encoding error on osx/py3 https://travis-ci.org/giampaolo/psutil/jobs/104073357
-rw-r--r-- | psutil/_psutil_osx.c | 9 |
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 } |