Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Objects/classobject.c
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);

4
Objects/methodobject.c
View File

@ -71,14 +71,14 @@ getself(op)
}
int
getvarargs(op)
getflags(op)
object *op;
{
if (!is_methodobject(op)) {
err_badcall();
return -1;
}
return ((methodobject *)op) -> m_ml -> ml_flags & METH_VARARGS;
return ((methodobject *)op) -> m_ml -> ml_flags;
}
/* Methods (the standard built-in methods, that is) */