From 96d1ee6465a5c44589a99b8fc6b82ca1f31b6d29 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Thu, 23 Feb 2017 11:48:22 +0100 Subject: [PATCH] python: drop tp_getattr implementation MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit tp_getattr method of type object is deprecated already in Python2 and gone in Python3. Default implementation does the same as this custom one. Signed-off-by: Marek Marczykowski-Górecki Acked-by: Wei Liu --- tools/python/xen/lowlevel/xc/xc.c | 7 +------ tools/python/xen/lowlevel/xs/xs.c | 7 +------ 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/tools/python/xen/lowlevel/xc/xc.c b/tools/python/xen/lowlevel/xc/xc.c index 6dcfb0a556..c8ffbe44a7 100644 --- a/tools/python/xen/lowlevel/xc/xc.c +++ b/tools/python/xen/lowlevel/xc/xc.c @@ -2640,11 +2640,6 @@ static PyMethodDef pyxc_methods[] = { }; -static PyObject *PyXc_getattr(PyObject *obj, char *name) -{ - return Py_FindMethod(pyxc_methods, obj, name); -} - static PyObject *PyXc_new(PyTypeObject *type, PyObject *args, PyObject *kwds) { XcObject *self = (XcObject *)type->tp_alloc(type, 0); @@ -2686,7 +2681,7 @@ static PyTypeObject PyXcType = { 0, (destructor)PyXc_dealloc, /* tp_dealloc */ NULL, /* tp_print */ - PyXc_getattr, /* tp_getattr */ + NULL, /* tp_getattr */ NULL, /* tp_setattr */ NULL, /* tp_compare */ NULL, /* tp_repr */ diff --git a/tools/python/xen/lowlevel/xs/xs.c b/tools/python/xen/lowlevel/xs/xs.c index 5772f4b162..e9eef7380c 100644 --- a/tools/python/xen/lowlevel/xs/xs.c +++ b/tools/python/xen/lowlevel/xs/xs.c @@ -870,11 +870,6 @@ static PyMethodDef xshandle_methods[] = { { NULL /* Sentinel. */ }, }; -static PyObject *xshandle_getattr(PyObject *self, char *name) -{ - return Py_FindMethod(xshandle_methods, self, name); -} - static PyObject * xshandle_new(PyTypeObject *type, PyObject *args, PyObject *kwds) { @@ -938,7 +933,7 @@ static PyTypeObject xshandle_type = { 0, (destructor)xshandle_dealloc, /* tp_dealloc */ NULL, /* tp_print */ - xshandle_getattr, /* tp_getattr */ + NULL, /* tp_getattr */ NULL, /* tp_setattr */ NULL, /* tp_compare */ NULL, /* tp_repr */ -- 2.30.2