From c81248b02928f12e84e2bd3cdf2da29d15b5f5b8 Mon Sep 17 00:00:00 2001 From: Giampaolo Rodola Date: Wed, 29 Mar 2023 00:02:18 +0200 Subject: fix C compilation warning on Linux + Python 2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit psutil/_psutil_linux.c: In function ‘psutil_proc_cpu_affinity_set’: psutil/_psutil_linux.c:317:80: warning: unknown conversion type character ‘R’ in format [-Wformat=] 317 | return PyErr_Format(PyExc_TypeError, "sequence argument expected, got %R", Py_TYPE(py_cpu_set)); | ^ psutil/_psutil_linux.c:317:46: warning: too many arguments for format [-Wformat-extra-args] 317 | return PyErr_Format(PyExc_TypeError, "sequence argument expected, got %R", Py_TYPE(py_cpu_set)); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ creating build/lib.linux-x86_64-2.7 --- psutil/_psutil_linux.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'psutil') diff --git a/psutil/_psutil_linux.c b/psutil/_psutil_linux.c index f04fe776..924fe702 100644 --- a/psutil/_psutil_linux.c +++ b/psutil/_psutil_linux.c @@ -314,7 +314,14 @@ psutil_proc_cpu_affinity_set(PyObject *self, PyObject *args) { return NULL; if (!PySequence_Check(py_cpu_set)) { - return PyErr_Format(PyExc_TypeError, "sequence argument expected, got %R", Py_TYPE(py_cpu_set)); + return PyErr_Format( + PyExc_TypeError, +#if PY_MAJOR_VERSION >= 3 + "sequence argument expected, got %R", Py_TYPE(py_cpu_set) +#else + "sequence argument expected, got %s", Py_TYPE(py_cpu_set)->tp_name +#endif + ); } seq_len = PySequence_Size(py_cpu_set); -- cgit v1.2.1