diff options
| author | Giampaolo Rodola <g.rodola@gmail.com> | 2017-05-18 05:02:40 +0200 |
|---|---|---|
| committer | Giampaolo Rodola <g.rodola@gmail.com> | 2017-05-18 05:02:40 +0200 |
| commit | 6cce4e7542728de20ab597ae1cd43bed5b0b6df8 (patch) | |
| tree | ac6481895974efcb8557de05bb63cb40763154cf | |
| parent | 759b8a88ead6caf294aa45e84578056dc79440df (diff) | |
| download | psutil-6cce4e7542728de20ab597ae1cd43bed5b0b6df8.tar.gz | |
fix travis
| -rw-r--r-- | HISTORY.rst | 2 | ||||
| -rw-r--r-- | psutil/_psutil_common.c | 3 | ||||
| -rwxr-xr-x | psutil/tests/test_connections.py | 1 |
3 files changed, 3 insertions, 3 deletions
diff --git a/HISTORY.rst b/HISTORY.rst index 974af617..b1843887 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -48,8 +48,8 @@ - 1042_: [FreeBSD] psutil won't compile on FreeBSD 12. - 1046_: [Windows] disk_partitions() on Windows overrides user's SetErrorMode. - 1047_: [Windows] Process username(): memory leak in case exception is thrown. -- 1050_: [Windows] Process.memory_maps memory() leaks memory. - 1048_: [Windows] users()'s host field report an invalid IP address. +- 1050_: [Windows] Process.memory_maps memory() leaks memory. - 1055_: cpu_count() is no longer cached. - 1058_: fixed Python warnings. - 1062_: disk_io_counters() and net_io_counters() raise TypeError if no disks diff --git a/psutil/_psutil_common.c b/psutil/_psutil_common.c index bcbd623b..c757c725 100644 --- a/psutil/_psutil_common.c +++ b/psutil/_psutil_common.c @@ -48,8 +48,9 @@ PyUnicode_DecodeFSDefault(char *s) { return PyString_FromString(s); } + PyObject * PyUnicode_DecodeFSDefaultAndSize(char *s, Py_ssize_t size) { return PyString_FromStringAndSize(s, size); } -#endif
\ No newline at end of file +#endif diff --git a/psutil/tests/test_connections.py b/psutil/tests/test_connections.py index 27822a80..83a5278a 100755 --- a/psutil/tests/test_connections.py +++ b/psutil/tests/test_connections.py @@ -24,7 +24,6 @@ from psutil import OSX from psutil import POSIX from psutil import SUNOS from psutil import WINDOWS -from psutil._common import pconn from psutil._common import supports_ipv6 from psutil._compat import PY3 from psutil.tests import AF_UNIX |