summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGiampaolo Rodola <g.rodola@gmail.com>2016-01-23 22:11:10 +0100
committerGiampaolo Rodola <g.rodola@gmail.com>2016-01-23 22:11:10 +0100
commitfae5c4dabba481fdab312a4ca24adcacb12f8d9d (patch)
tree4f31b3d6789e749ce13ece3bcd0764d5c1af749d
parentcbc548ea071cc96d915230a18236d103d1db1a6a (diff)
downloadpsutil-fae5c4dabba481fdab312a4ca24adcacb12f8d9d.tar.gz
get rid of other ENCODING_ERRORS_HANDLER references
-rw-r--r--psutil/__init__.py1
-rw-r--r--psutil/_psutil_osx.c3
2 files changed, 0 insertions, 4 deletions
diff --git a/psutil/__init__.py b/psutil/__init__.py
index adc9e8c5..10eee585 100644
--- a/psutil/__init__.py
+++ b/psutil/__init__.py
@@ -155,7 +155,6 @@ __all__ = [
"CONN_LAST_ACK", "CONN_LISTEN", "CONN_CLOSING", "CONN_NONE",
"AF_LINK",
"NIC_DUPLEX_FULL", "NIC_DUPLEX_HALF", "NIC_DUPLEX_UNKNOWN",
- "ENCODING_ERRORS_HANDLER",
# classes
"Process", "Popen",
# functions
diff --git a/psutil/_psutil_osx.c b/psutil/_psutil_osx.c
index 48ca23ff..7f8c0ff7 100644
--- a/psutil/_psutil_osx.c
+++ b/psutil/_psutil_osx.c
@@ -166,7 +166,6 @@ psutil_proc_cwd(PyObject *self, PyObject *args) {
}
#if PY_MAJOR_VERSION >= 3
- // TODO: have python pass ENCODING_ERRORS_HANDLER as an arg
return PyUnicode_DecodeFSDefault(pathinfo.pvi_cdir.vip_path);
#else
return Py_BuildValue("s", pathinfo.pvi_cdir.vip_path);
@@ -191,7 +190,6 @@ psutil_proc_exe(PyObject *self, PyObject *args) {
return NULL;
}
#if PY_MAJOR_VERSION >= 3
- // TODO: have python pass ENCODING_ERRORS_HANDLER as an arg
return PyUnicode_DecodeFSDefault(buf);
#else
return Py_BuildValue("s", buf);
@@ -1067,7 +1065,6 @@ psutil_proc_open_files(PyObject *self, PyObject *args) {
// --- construct python list
#if PY_MAJOR_VERSION >= 3
- // TODO: have python pass ENCODING_ERRORS_HANDLER as an arg
py_path = PyUnicode_DecodeFSDefault(vi.pvip.vip_path);
#else
py_path = Py_BuildValue("s", vi.pvip.vip_path);