From dd562b49fc954a01c7d47f6baf1454d0044244d0 Mon Sep 17 00:00:00 2001 From: "Michael W. Hudson" Date: Mon, 28 Jan 2002 15:03:36 +0000 Subject: [PATCH] It's merge time! Backport gvanrossum's checkin of revision 2.38: There's no need for typechecks on the second and third argument of new.instancemethod() -- the instancemethod object is now a perfectly general container. This fixes SF bug ##503091 (Pedro Rodriquez): new.instancemethod fails for new classes This is a 2.2.1 candidate. --- Modules/newmodule.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/Modules/newmodule.c b/Modules/newmodule.c index 252637ab524e..0a48926da65e 100644 --- a/Modules/newmodule.c +++ b/Modules/newmodule.c @@ -40,10 +40,8 @@ new_instancemethod(PyObject* unused, PyObject* args) PyObject* self; PyObject* classObj; - if (!PyArg_ParseTuple(args, "OOO!:instancemethod", - &func, - &self, - &PyClass_Type, &classObj)) + if (!PyArg_ParseTuple(args, "OOO:instancemethod", + &func, &self, &classObj)) return NULL; if (!PyCallable_Check(func)) { PyErr_SetString(PyExc_TypeError, @@ -52,11 +50,6 @@ new_instancemethod(PyObject* unused, PyObject* args) } if (self == Py_None) self = NULL; - else if (!PyInstance_Check(self)) { - PyErr_SetString(PyExc_TypeError, - "second argument must be instance or None"); - return NULL; - } return PyMethod_New(func, self, classObj); } -- 2.47.3