changes for keyword args to built-in functions and classes

This commit is contained in:
Guido van Rossum 1995-07-26 18:07:32 +00:00
parent bebdc376c3
commit a83f270a4b
2 changed files with 8 additions and 7 deletions

View file

@ -279,9 +279,10 @@ addaccess(class, inst)
}
object *
newinstanceobject(class, arg)
newinstanceobject(class, arg, kw)
object *class;
object *arg;
object *kw;
{
register instanceobject *inst;
object *init;
@ -303,16 +304,16 @@ newinstanceobject(class, arg)
init = instance_getattr1(inst, "__init__");
if (init == NULL) {
err_clear();
if (arg != NULL && !(is_tupleobject(arg) &&
gettuplesize(arg) == 0)) {
if (arg != NULL && (!is_tupleobject(arg) ||
gettuplesize(arg) != 0) || kw != NULL) {
err_setstr(TypeError,
"this classobject() takes no arguments");
"this constructor takes no arguments");
DECREF(inst);
inst = NULL;
}
}
else {
object *res = call_object(init, arg);
object *res = PyEval_CallObjectWithKeywords(init, arg, kw);
DECREF(init);
if (res == NULL) {
DECREF(inst);