traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Experimental feature: add default argument to getattr().

This commit is contained in:
Guido van Rossum 1998-06-29 13:38:57 +00:00
parent 39ef2274a3
commit 950ff2923a
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Python/bltinmodule.c
View File

@ -669,18 +669,26 @@ builtin_getattr(self, args)
PyObject *self;
PyObject *args;
{
PyObject *v;
PyObject *v, *result, *dflt = NULL;
PyObject *name;
if (!PyArg_ParseTuple(args, "OS:getattr", &v, &name))
if (!PyArg_ParseTuple(args, "OS|O:getattr", &v, &name, &dflt))
return NULL;
return PyObject_GetAttr(v, name);
result = PyObject_GetAttr(v, name);
if (result == NULL && dflt != NULL) {
PyErr_Clear();
Py_INCREF(dflt);
result = dflt;
}
return result;
}
static char getattr_doc[] =
"getattr(object, name) -> value\n\
"getattr(object, name[, default]) -> value\n\
\n\
Get a named attribute from an object; getattr(x, 'y') is equivalent to x.y.";
Get a named attribute from an object; getattr(x, 'y') is equivalent to x.y.\n\
When a default argument is given, it is returned when the attribute doesn't\n\
exist; without it, an exception is raised in that case.";
static PyObject *