changes for keyword args to built-in functions and classes

This commit is contained in:
Guido van Rossum 1995-07-26 17:58:29 +00:00
parent 454674d5db
commit bebdc376c3
3 changed files with 6 additions and 3 deletions

View File

@ -62,7 +62,7 @@ extern DL_IMPORT(PyTypeObject) PyClass_Type, PyInstance_Type, PyMethod_Type;
#define PyMethod_Check(op) ((op)->ob_type == &PyMethod_Type) #define PyMethod_Check(op) ((op)->ob_type == &PyMethod_Type)
extern PyObject *PyClass_New Py_PROTO((PyObject *, PyObject *, PyObject *)); extern PyObject *PyClass_New Py_PROTO((PyObject *, PyObject *, PyObject *));
extern PyObject *PyInstance_New Py_PROTO((PyObject *, PyObject *)); extern PyObject *PyInstance_New Py_PROTO((PyObject *, PyObject *, PyObject *));
extern PyObject *PyMethod_New Py_PROTO((PyObject *, PyObject *, PyObject *)); extern PyObject *PyMethod_New Py_PROTO((PyObject *, PyObject *, PyObject *));
extern PyObject *PyMethod_Function Py_PROTO((PyObject *)); extern PyObject *PyMethod_Function Py_PROTO((PyObject *));

View File

@ -35,10 +35,12 @@ extern DL_IMPORT(PyTypeObject) PyCFunction_Type;
#define PyCFunction_Check(op) ((op)->ob_type == &PyCFunction_Type) #define PyCFunction_Check(op) ((op)->ob_type == &PyCFunction_Type)
typedef PyObject *(*PyCFunction) Py_FPROTO((PyObject *, PyObject *)); typedef PyObject *(*PyCFunction) Py_FPROTO((PyObject *, PyObject *));
typedef PyObject *(*PyCFunctionWithKeywords)
Py_FPROTO((PyObject *, PyObject *, PyObject *));
extern PyCFunction PyCFunction_GetFunction Py_PROTO((PyObject *)); extern PyCFunction PyCFunction_GetFunction Py_PROTO((PyObject *));
extern PyObject *PyCFunction_GetSelf Py_PROTO((PyObject *)); extern PyObject *PyCFunction_GetSelf Py_PROTO((PyObject *));
extern int PyCFunction_IsVarArgs Py_PROTO((PyObject *)); extern int PyCFunction_GetFlags Py_PROTO((PyObject *));
struct PyMethodDef { struct PyMethodDef {
char *ml_name; char *ml_name;
@ -56,6 +58,7 @@ extern PyObject *PyCFunction_New
/* Flag passed to newmethodobject */ /* Flag passed to newmethodobject */
#define METH_VARARGS 0x0001 #define METH_VARARGS 0x0001
#define METH_KEYWORDS 0x0002
typedef struct PyMethodChain { typedef struct PyMethodChain {
PyMethodDef *methods; /* Methods of this type */ PyMethodDef *methods; /* Methods of this type */

View File

@ -292,7 +292,7 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#define findmethodinchain Py_FindMethodInChain #define findmethodinchain Py_FindMethodInChain
#define getmethod PyCFunction_GetFunction #define getmethod PyCFunction_GetFunction
#define getself PyCFunction_GetSelf #define getself PyCFunction_GetSelf
#define getvarargs PyCFunction_IsVarArgs #define getflags PyCFunction_GetFlags
#define newmethodobject PyCFunction_New #define newmethodobject PyCFunction_New
#define getmoduledict PyModule_GetDict #define getmoduledict PyModule_GetDict
#define getmodulename PyModule_GetName #define getmodulename PyModule_GetName