Update of /cvsroot/python/python/dist/src/Modules
In directory sc8-pr-cvs1:/tmp/cvs-serv29352/Modules
Modified Files:
operator.c
Log Message:
As discussed on python-dev, added two extractor functions to the
operator module.
Index: operator.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/operator.c,v
retrieving revision 2.27
retrieving revision 2.28
diff -C2 -d -r2.27 -r2.28
*** operator.c 18 Jan 2003 23:22:20 -0000 2.27
--- operator.c 1 Dec 2003 13:18:39 -0000 2.28
***************
*** 253,257 ****
--- 253,468 ----
};
+ /* itemgetter object **********************************************************/
+
+ typedef struct {
+ PyObject_HEAD
+ PyObject *item;
+ } itemgetterobject;
+
+ static PyTypeObject itemgetter_type;
+
+ static PyObject *
+ itemgetter_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
+ {
+ itemgetterobject *ig;
+ PyObject *item;
+
+ if (!PyArg_UnpackTuple(args, "itemgetter", 1, 1, &item))
+ return NULL;
+
+ /* create itemgetterobject structure */
+ ig = PyObject_GC_New(itemgetterobject, &itemgetter_type);
+ if (ig == NULL)
+ return NULL;
+
+ Py_INCREF(item);
+ ig->item = item;
+
+ PyObject_GC_Track(ig);
+ return (PyObject *)ig;
+ }
+
+ static void
+ itemgetter_dealloc(itemgetterobject *ig)
+ {
+ PyObject_GC_UnTrack(ig);
+ Py_XDECREF(ig->item);
+ PyObject_GC_Del(ig);
+ }
+
+ static int
+ itemgetter_traverse(itemgetterobject *ig, visitproc visit, void *arg)
+ {
+ if (ig->item)
+ return visit(ig->item, arg);
+ return 0;
+ }
+
+ static PyObject *
+ itemgetter_call(itemgetterobject *ig, PyObject *args, PyObject *kw)
+ {
+ PyObject * obj;
+
+ if (!PyArg_UnpackTuple(args, "itemgetter", 1, 1, &obj))
+ return NULL;
+ return PyObject_GetItem(obj, ig->item);
+ }
+
+ PyDoc_STRVAR(itemgetter_doc,
+ "itemgetter(item) --> itemgetter object\n\
+ \n\
+ Return a callable object that fetches the given item from its operand.\n\
+ After, f=itemgetter(2), the call f(b) returns b[2].");
+ static PyTypeObject itemgetter_type = {
+ PyObject_HEAD_INIT(NULL)
+ 0, /* ob_size */
+ "itertools.itemgetter", /* tp_name */
+ sizeof(itemgetterobject), /* tp_basicsize */
+ 0, /* tp_itemsize */
+ /* methods */
+ (destructor)itemgetter_dealloc, /* tp_dealloc */
+ 0, /* tp_print */
+ 0, /* tp_getattr */
+ 0, /* tp_setattr */
+ 0, /* tp_compare */
+ 0, /* tp_repr */
+ 0, /* tp_as_number */
+ 0, /* tp_as_sequence */
+ 0, /* tp_as_mapping */
+ 0, /* tp_hash */
+ (ternaryfunc)itemgetter_call, /* tp_call */
+ 0, /* tp_str */
+ PyObject_GenericGetAttr, /* tp_getattro */
+ 0, /* tp_setattro */
+ 0, /* tp_as_buffer */
+ Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC, /* tp_flags */
+ itemgetter_doc, /* tp_doc */
+ (traverseproc)itemgetter_traverse, /* tp_traverse */
+ 0, /* tp_clear */
+ 0, /* tp_richcompare */
+ 0, /* tp_weaklistoffset */
+ 0, /* tp_iter */
+ 0, /* tp_iternext */
+ 0, /* tp_methods */
+ 0, /* tp_members */
+ 0, /* tp_getset */
+ 0, /* tp_base */
+ 0, /* tp_dict */
+ 0, /* tp_descr_get */
+ 0, /* tp_descr_set */
+ 0, /* tp_dictoffset */
+ 0, /* tp_init */
+ 0, /* tp_alloc */
+ itemgetter_new, /* tp_new */
+ 0, /* tp_free */
+ };
+
+
+ /* attrgetter object **********************************************************/
+
+ typedef struct {
+ PyObject_HEAD
+ PyObject *attr;
+ } attrgetterobject;
+
+ static PyTypeObject attrgetter_type;
+
+ static PyObject *
+ attrgetter_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
+ {
+ attrgetterobject *ag;
+ PyObject *attr;
+
+ if (!PyArg_UnpackTuple(args, "attrgetter", 1, 1, &attr))
+ return NULL;
+
+ /* create attrgetterobject structure */
+ ag = PyObject_GC_New(attrgetterobject, &attrgetter_type);
+ if (ag == NULL)
+ return NULL;
+
+ Py_INCREF(attr);
+ ag->attr = attr;
+
+ PyObject_GC_Track(ag);
+ return (PyObject *)ag;
+ }
+
+ static void
+ attrgetter_dealloc(attrgetterobject *ag)
+ {
+ PyObject_GC_UnTrack(ag);
+ Py_XDECREF(ag->attr);
+ PyObject_GC_Del(ag);
+ }
+
+ static int
+ attrgetter_traverse(attrgetterobject *ag, visitproc visit, void *arg)
+ {
+ if (ag->attr)
+ return visit(ag->attr, arg);
+ return 0;
+ }
+
+ static PyObject *
+ attrgetter_call(attrgetterobject *ag, PyObject *args, PyObject *kw)
+ {
+ PyObject * obj;
+
+ if (!PyArg_UnpackTuple(args, "attrgetter", 1, 1, &obj))
+ return NULL;
+ return PyObject_GetAttr(obj, ag->attr);
+ }
+
+ PyDoc_STRVAR(attrgetter_doc,
+ "attrgetter(attr) --> attrgetter object\n\
+ \n\
+ Return a callable object that fetches the given attribute from its operand.\n\
+ After, f=attrgetter('name'), the call f(b) returns b.name.");
+
+ static PyTypeObject attrgetter_type = {
+ PyObject_HEAD_INIT(NULL)
+ 0, /* ob_size */
+ "itertools.attrgetter", /* tp_name */
+ sizeof(attrgetterobject), /* tp_basicsize */
+ 0, /* tp_itemsize */
+ /* methods */
+ (destructor)attrgetter_dealloc, /* tp_dealloc */
+ 0, /* tp_print */
+ 0, /* tp_getattr */
+ 0, /* tp_setattr */
+ 0, /* tp_compare */
+ 0, /* tp_repr */
+ 0, /* tp_as_number */
+ 0, /* tp_as_sequence */
+ 0, /* tp_as_mapping */
+ 0, /* tp_hash */
+ (ternaryfunc)attrgetter_call, /* tp_call */
+ 0, /* tp_str */
+ PyObject_GenericGetAttr, /* tp_getattro */
+ 0, /* tp_setattro */
+ 0, /* tp_as_buffer */
+ Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC, /* tp_flags */
+ attrgetter_doc, /* tp_doc */
+ (traverseproc)attrgetter_traverse, /* tp_traverse */
+ 0, /* tp_clear */
+ 0, /* tp_richcompare */
+ 0, /* tp_weaklistoffset */
+ 0, /* tp_iter */
+ 0, /* tp_iternext */
+ 0, /* tp_methods */
+ 0, /* tp_members */
+ 0, /* tp_getset */
+ 0, /* tp_base */
+ 0, /* tp_dict */
+ 0, /* tp_descr_get */
+ 0, /* tp_descr_set */
+ 0, /* tp_dictoffset */
+ 0, /* tp_init */
+ 0, /* tp_alloc */
+ attrgetter_new, /* tp_new */
+ 0, /* tp_free */
+ };
/* Initialization function for the module (*must* be called initoperator) */
***************
*** 259,264 ****
initoperator(void)
{
! /* Create the module and add the functions */
! Py_InitModule4("operator", operator_methods, operator_doc,
(PyObject*)NULL, PYTHON_API_VERSION);
}
--- 470,487 ----
initoperator(void)
{
! PyObject *m;
!
! /* Create the module and add the functions */
! m = Py_InitModule4("operator", operator_methods, operator_doc,
(PyObject*)NULL, PYTHON_API_VERSION);
+
+ if (PyType_Ready(&itemgetter_type) < 0)
+ return;
+ Py_INCREF(&itemgetter_type);
+ PyModule_AddObject(m, "itemgetter", (PyObject *)&itemgetter_type);
+
+ if (PyType_Ready(&attrgetter_type) < 0)
+ return;
+ Py_INCREF(&attrgetter_type);
+ PyModule_AddObject(m, "attrgetter", (PyObject *)&attrgetter_type);
}
