From 3a9bccfd2c6d2e6538298cd3892058b1204056e0 Mon Sep 17 00:00:00 2001 From: Riccardo Schirone Date: Mon, 18 Nov 2019 15:51:39 +0100 Subject: psutil/_psutil_posix.c: better clear variables to ensure they are NULL (#1624) --- psutil/_psutil_posix.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) 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); -- cgit v1.2.1 From d84fb073fda024d9320e965257f22fb73a4497b6 Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade Date: Wed, 20 Nov 2019 06:36:04 +0200 Subject: Run slower jobs first so they don't hold up the CI (#1626) --- .travis.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 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 -- cgit v1.2.1