mirror of
https://github.com/python/cpython.git
synced 2024-11-26 11:24:40 +08:00
Sigh, changed the argument names in the tp_init function: to make them be
more in line with other methods "self" and "args" had to be renamed "_self" and "_args". Did "_kwds" too, for consistency.
This commit is contained in:
parent
f73b4b0077
commit
7b8f0a1843
@ -385,7 +385,7 @@ class PEP253Mixin(PEP252Mixin):
|
|||||||
|
|
||||||
def output_tp_init(self):
|
def output_tp_init(self):
|
||||||
if self.output_tp_initBody:
|
if self.output_tp_initBody:
|
||||||
Output("static int %s_tp_init(PyObject *self, PyObject *args, PyObject *kwds)", self.prefix)
|
Output("static int %s_tp_init(PyObject *_self, PyObject *_args, PyObject *_kwds)", self.prefix)
|
||||||
OutLbrace()
|
OutLbrace()
|
||||||
self.output_tp_initBody()
|
self.output_tp_initBody()
|
||||||
OutRbrace()
|
OutRbrace()
|
||||||
@ -407,19 +407,19 @@ class PEP253Mixin(PEP252Mixin):
|
|||||||
Output()
|
Output()
|
||||||
|
|
||||||
def output_tp_newBody(self):
|
def output_tp_newBody(self):
|
||||||
Output("PyObject *self;");
|
Output("PyObject *_self;");
|
||||||
Output("%s itself;", self.itselftype);
|
Output("%s itself;", self.itselftype);
|
||||||
Output("char *kw[] = {\"itself\", 0};")
|
Output("char *kw[] = {\"itself\", 0};")
|
||||||
Output()
|
Output()
|
||||||
Output("if (!PyArg_ParseTupleAndKeywords(args, kwds, \"O&\", kw, %s_Convert, &itself)) return NULL;",
|
Output("if (!PyArg_ParseTupleAndKeywords(_args, _kwds, \"O&\", kw, %s_Convert, &itself)) return NULL;",
|
||||||
self.prefix);
|
self.prefix);
|
||||||
Output("if ((self = type->tp_alloc(type, 0)) == NULL) return NULL;")
|
Output("if ((_self = type->tp_alloc(type, 0)) == NULL) return NULL;")
|
||||||
Output("((%s *)self)->ob_itself = itself;", self.objecttype)
|
Output("((%s *)_self)->ob_itself = itself;", self.objecttype)
|
||||||
Output("return self;")
|
Output("return _self;")
|
||||||
|
|
||||||
def output_tp_new(self):
|
def output_tp_new(self):
|
||||||
if self.output_tp_newBody:
|
if self.output_tp_newBody:
|
||||||
Output("static PyObject *%s_tp_new(PyTypeObject *type, PyObject *args, PyObject *kwds)", self.prefix)
|
Output("static PyObject *%s_tp_new(PyTypeObject *type, PyObject *_args, PyObject *_kwds)", self.prefix)
|
||||||
OutLbrace()
|
OutLbrace()
|
||||||
self.output_tp_newBody()
|
self.output_tp_newBody()
|
||||||
OutRbrace()
|
OutRbrace()
|
||||||
|
Loading…
Reference in New Issue
Block a user