diff options
| author | Giampaolo Rodola <g.rodola@gmail.com> | 2016-01-22 13:32:27 +0100 |
|---|---|---|
| committer | Giampaolo Rodola <g.rodola@gmail.com> | 2016-01-22 13:32:27 +0100 |
| commit | ba838832f03365587191b2e1849278d3eb414ee1 (patch) | |
| tree | 3ce43e06c587e33c7b83f6d6cd511e15d2a5c899 | |
| parent | 585cb1560bc6c33c8c3c6a6547e6078b7f4e174c (diff) | |
| download | psutil-ba838832f03365587191b2e1849278d3eb414ee1.tar.gz | |
osx: attempt another fix to cwd unicode; also enabl python 3.5 for appveyor
| -rw-r--r-- | appveyor.yml | 11 | ||||
| -rw-r--r-- | psutil/_psutil_osx.c | 6 |
2 files changed, 9 insertions, 8 deletions
diff --git a/appveyor.yml b/appveyor.yml index 10080c79..f80b17cf 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -22,20 +22,25 @@ environment: PYTHON_VERSION: "3.4.x" PYTHON_ARCH: "32" + - PYTHON: "C:\\Python35" + PYTHON_VERSION: "3.5.x" + PYTHON_ARCH: "32" + - PYTHON: "C:\\Python27-x64" PYTHON_VERSION: "2.7.x" PYTHON_ARCH: "64" - WINDOWS_SDK_VERSION: "v7.0" - PYTHON: "C:\\Python33-x64" PYTHON_VERSION: "3.3.x" PYTHON_ARCH: "64" - WINDOWS_SDK_VERSION: "v7.1" - PYTHON: "C:\\Python34-x64" PYTHON_VERSION: "3.4.x" PYTHON_ARCH: "64" - WINDOWS_SDK_VERSION: "v7.1" + + - PYTHON: "C:\\Python35-x64" + PYTHON_VERSION: "3.4.x" + PYTHON_ARCH: "64" # Also build on a Python version not pre-installed by Appveyor. # See: https://github.com/ogrisel/python-appveyor-demo/issues/10 diff --git a/psutil/_psutil_osx.c b/psutil/_psutil_osx.c index b9578864..2378ae0e 100644 --- a/psutil/_psutil_osx.c +++ b/psutil/_psutil_osx.c @@ -160,11 +160,7 @@ psutil_proc_cwd(PyObject *self, PyObject *args) { } #if PY_MAJOR_VERSION >= 3 - return PyUnicode_Decode( - pathinfo.pvi_cdir.vip_path, - sizeof(pathinfo.pvi_cdir.vip_path), - Py_FileSystemDefaultEncoding, - "surrogateescape"); + return PyUnicode_DecodeFSDefault(pathinfo.pvi_cdir.vip_path); #else return Py_BuildValue("s", pathinfo.pvi_cdir.vip_path); #endif |