From 6bf1900e18e57bc43824a229eadc95c98e016fa5 Mon Sep 17 00:00:00 2001 From: Mark Dickinson Date: Sat, 2 May 2009 17:57:52 +0000 Subject: Merged revisions 72202 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r72202 | mark.dickinson | 2009-05-02 18:55:01 +0100 (Sat, 02 May 2009) | 3 lines Remove unnecessary use of context for long getters. (Related to issue #5880). ........ --- Objects/longobject.c | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/Objects/longobject.c b/Objects/longobject.c index af8c14a..b83cdc8 100644 --- a/Objects/longobject.c +++ b/Objects/longobject.c @@ -3832,8 +3832,13 @@ long_getnewargs(PyLongObject *v) } static PyObject * -long_getN(PyLongObject *v, void *context) { - return PyLong_FromLong((Py_intptr_t)context); +long_get0(PyLongObject *v, void *context) { + return PyLong_FromLong(0L); +} + +static PyObject * +long_get1(PyLongObject *v, void *context) { + return PyLong_FromLong(1L); } static PyObject * @@ -4091,22 +4096,22 @@ static PyMethodDef long_methods[] = { }; static PyGetSetDef long_getset[] = { - {"real", + {"real", (getter)long_long, (setter)NULL, "the real part of a complex number", NULL}, - {"imag", - (getter)long_getN, (setter)NULL, + {"imag", + (getter)long_get0, (setter)NULL, "the imaginary part of a complex number", - (void*)0}, - {"numerator", + NULL}, + {"numerator", (getter)long_long, (setter)NULL, "the numerator of a rational number in lowest terms", NULL}, - {"denominator", - (getter)long_getN, (setter)NULL, + {"denominator", + (getter)long_get1, (setter)NULL, "the denominator of a rational number in lowest terms", - (void*)1}, + NULL}, {NULL} /* Sentinel */ }; -- cgit v0.12