mirror of
https://github.com/python/cpython.git
synced 2024-11-24 18:34:43 +08:00
Merged revisions 82317 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r82317 | benjamin.peterson | 2010-06-27 21:58:25 -0500 (Sun, 27 Jun 2010) | 1 line remove unused last argument to property_copy ........
This commit is contained in:
parent
2215c14f03
commit
9396483ba4
@ -1115,7 +1115,7 @@ typedef struct {
|
||||
} propertyobject;
|
||||
|
||||
static PyObject * property_copy(PyObject *, PyObject *, PyObject *,
|
||||
PyObject *, PyObject *);
|
||||
PyObject *);
|
||||
|
||||
static PyMemberDef property_members[] = {
|
||||
{"fget", T_OBJECT, offsetof(propertyobject, prop_get), READONLY},
|
||||
@ -1132,7 +1132,7 @@ PyDoc_STRVAR(getter_doc,
|
||||
static PyObject *
|
||||
property_getter(PyObject *self, PyObject *getter)
|
||||
{
|
||||
return property_copy(self, getter, NULL, NULL, NULL);
|
||||
return property_copy(self, getter, NULL, NULL);
|
||||
}
|
||||
|
||||
|
||||
@ -1142,7 +1142,7 @@ PyDoc_STRVAR(setter_doc,
|
||||
static PyObject *
|
||||
property_setter(PyObject *self, PyObject *setter)
|
||||
{
|
||||
return property_copy(self, NULL, setter, NULL, NULL);
|
||||
return property_copy(self, NULL, setter, NULL);
|
||||
}
|
||||
|
||||
|
||||
@ -1152,7 +1152,7 @@ PyDoc_STRVAR(deleter_doc,
|
||||
static PyObject *
|
||||
property_deleter(PyObject *self, PyObject *deleter)
|
||||
{
|
||||
return property_copy(self, NULL, NULL, deleter, NULL);
|
||||
return property_copy(self, NULL, NULL, deleter);
|
||||
}
|
||||
|
||||
|
||||
@ -1221,11 +1221,10 @@ property_descr_set(PyObject *self, PyObject *obj, PyObject *value)
|
||||
}
|
||||
|
||||
static PyObject *
|
||||
property_copy(PyObject *old, PyObject *get, PyObject *set, PyObject *del,
|
||||
PyObject *doc)
|
||||
property_copy(PyObject *old, PyObject *get, PyObject *set, PyObject *del)
|
||||
{
|
||||
propertyobject *pold = (propertyobject *)old;
|
||||
PyObject *new, *type;
|
||||
PyObject *new, *type, *doc;
|
||||
|
||||
type = PyObject_Type(old);
|
||||
if (type == NULL)
|
||||
@ -1243,15 +1242,12 @@ property_copy(PyObject *old, PyObject *get, PyObject *set, PyObject *del,
|
||||
Py_XDECREF(del);
|
||||
del = pold->prop_del ? pold->prop_del : Py_None;
|
||||
}
|
||||
if (doc == NULL || doc == Py_None) {
|
||||
Py_XDECREF(doc);
|
||||
if (pold->getter_doc && get != Py_None) {
|
||||
/* make _init use __doc__ from getter */
|
||||
doc = Py_None;
|
||||
}
|
||||
else {
|
||||
doc = pold->prop_doc ? pold->prop_doc : Py_None;
|
||||
}
|
||||
if (pold->getter_doc && get != Py_None) {
|
||||
/* make _init use __doc__ from getter */
|
||||
doc = Py_None;
|
||||
}
|
||||
else {
|
||||
doc = pold->prop_doc ? pold->prop_doc : Py_None;
|
||||
}
|
||||
|
||||
new = PyObject_CallFunction(type, "OOOO", get, set, del, doc);
|
||||
|
Loading…
Reference in New Issue
Block a user