diff options
| author | Giampaolo Rodola <g.rodola@gmail.com> | 2019-11-20 12:39:23 +0800 |
|---|---|---|
| committer | Giampaolo Rodola <g.rodola@gmail.com> | 2019-11-20 12:39:23 +0800 |
| commit | b5a10350c0d37e76017776ec02a992eb087bbcc4 (patch) | |
| tree | 8ebe90947b8d02e21f8bb29385e6bf9a07649b17 | |
| parent | bfe0ed73fcb1d76cb36939eeb5d8fd2020e97287 (diff) | |
| parent | d84fb073fda024d9320e965257f22fb73a4497b6 (diff) | |
| download | psutil-b5a10350c0d37e76017776ec02a992eb087bbcc4.tar.gz | |
Merge branch 'master' of github.com:giampaolo/psutil
| -rw-r--r-- | .travis.yml | 14 | ||||
| -rw-r--r-- | psutil/_psutil_posix.c | 10 |
2 files changed, 12 insertions, 12 deletions
diff --git a/.travis.yml b/.travis.yml index b3b0102d..97533144 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,13 +2,6 @@ language: python cache: pip matrix: include: - # Linux - - python: 2.7 - - python: 3.4 - - python: 3.5 - - python: 3.6 - - python: 3.7 - dist: xenial # macOS - language: generic os: osx @@ -16,6 +9,13 @@ matrix: - language: generic os: osx env: PYVER=py36 + # Linux + - python: 2.7 + - python: 3.4 + - python: 3.5 + - python: 3.6 + - python: 3.7 + dist: xenial # pypy # - python: pypy # - python: pypy3 diff --git a/psutil/_psutil_posix.c b/psutil/_psutil_posix.c index 209e787d..aa600849 100644 --- a/psutil/_psutil_posix.c +++ b/psutil/_psutil_posix.c @@ -324,11 +324,11 @@ psutil_net_if_addrs(PyObject* self, PyObject* args) { goto error; if (PyList_Append(py_retlist, py_tuple)) goto error; - Py_DECREF(py_tuple); - Py_DECREF(py_address); - Py_DECREF(py_netmask); - Py_DECREF(py_broadcast); - Py_DECREF(py_ptp); + Py_CLEAR(py_tuple); + Py_CLEAR(py_address); + Py_CLEAR(py_netmask); + Py_CLEAR(py_broadcast); + Py_CLEAR(py_ptp); } freeifaddrs(ifaddr); |