summaryrefslogtreecommitdiff
path: root/Modules
diff options
context:
space:
mode:
authorGuido van Rossum <guido@python.org>2002-01-15 19:21:05 +0000
committerGuido van Rossum <guido@python.org>2002-01-15 19:21:05 +0000
commit7c84f749faf77e599afe5c19d3e896f9326d464c (patch)
tree8a18f6db45b78c5115418f2a580d93e4b9ac0351 /Modules
parentb5ae7e8f508a3d20cdefc14da4cb5f4d88fc2ab5 (diff)
downloadcpython-7c84f749faf77e599afe5c19d3e896f9326d464c.tar.gz
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.
Diffstat (limited to 'Modules')
-rw-r--r--Modules/newmodule.c11
1 files changed, 2 insertions, 9 deletions
diff --git a/Modules/newmodule.c b/Modules/newmodule.c
index 252637ab52..0a48926da6 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);
}