diff options
| author | Guido van Rossum <guido@python.org> | 1995-07-26 17:58:29 (GMT) |
|---|---|---|
| committer | Guido van Rossum <guido@python.org> | 1995-07-26 17:58:29 (GMT) |
| commit | bebdc376c3aa584bfb9825758d5cf8d5c09c8692 (patch) | |
| tree | 3d1b6a3fab65ed5907155bc2f557efd375c27e17 /Include | |
| parent | 454674d5dbbaf11364f947065cfbef98043c710d (diff) | |
| download | cpython-bebdc376c3aa584bfb9825758d5cf8d5c09c8692.zip cpython-bebdc376c3aa584bfb9825758d5cf8d5c09c8692.tar.gz cpython-bebdc376c3aa584bfb9825758d5cf8d5c09c8692.tar.bz2 | |
changes for keyword args to built-in functions and classes
Diffstat (limited to 'Include')
| -rw-r--r-- | Include/classobject.h | 2 | ||||
| -rw-r--r-- | Include/methodobject.h | 5 | ||||
| -rw-r--r-- | Include/rename2.h | 2 |
3 files changed, 6 insertions, 3 deletions
diff --git a/Include/classobject.h b/Include/classobject.h index f87d02e..807dff7 100644 --- a/Include/classobject.h +++ b/Include/classobject.h @@ -62,7 +62,7 @@ extern DL_IMPORT(PyTypeObject) PyClass_Type, PyInstance_Type, PyMethod_Type; #define PyMethod_Check(op) ((op)->ob_type == &PyMethod_Type) 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_Function Py_PROTO((PyObject *)); diff --git a/Include/methodobject.h b/Include/methodobject.h index cbe3270..243b3be 100644 --- a/Include/methodobject.h +++ b/Include/methodobject.h @@ -35,10 +35,12 @@ extern DL_IMPORT(PyTypeObject) PyCFunction_Type; #define PyCFunction_Check(op) ((op)->ob_type == &PyCFunction_Type) typedef PyObject *(*PyCFunction) Py_FPROTO((PyObject *, PyObject *)); +typedef PyObject *(*PyCFunctionWithKeywords) + Py_FPROTO((PyObject *, PyObject *, PyObject *)); extern PyCFunction PyCFunction_GetFunction 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 { char *ml_name; @@ -56,6 +58,7 @@ extern PyObject *PyCFunction_New /* Flag passed to newmethodobject */ #define METH_VARARGS 0x0001 +#define METH_KEYWORDS 0x0002 typedef struct PyMethodChain { PyMethodDef *methods; /* Methods of this type */ diff --git a/Include/rename2.h b/Include/rename2.h index 417dea6..adc91d4 100644 --- a/Include/rename2.h +++ b/Include/rename2.h @@ -292,7 +292,7 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. #define findmethodinchain Py_FindMethodInChain #define getmethod PyCFunction_GetFunction #define getself PyCFunction_GetSelf -#define getvarargs PyCFunction_IsVarArgs +#define getflags PyCFunction_GetFlags #define newmethodobject PyCFunction_New #define getmoduledict PyModule_GetDict #define getmodulename PyModule_GetName |