cpython-lru_cache-weakref: Modules/operator.c annotate

annotate Modules/operator.c @ 74006:88198b93ff2f

Issue #13560: Add PyUnicode_EncodeLocale() * Use PyUnicode_EncodeLocale() in time.strftime() if wcsftime() is not available * Document my last changes in Misc/NEWS

author	Victor Stinner <victor.stinner@haypocalc.com>
date	Sat, 17 Dec 2011 04:13:41 +0100
parents	8beaa9a37387
children	c82451eeb595

rev	line source
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 22805 diff changeset	1
ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 22805 diff changeset	2 #include "Python.h"
ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 22805 diff changeset	3
ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 22805 diff changeset	4 PyDoc_STRVAR(operator_doc,
ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 22805 diff changeset	5 "Operator interface.\n\
3844 0d54a14ef0b8 Operators like __add__ Guido van Rossum <guido@python.org> parents: diff changeset	6 \n\
0d54a14ef0b8 Operators like __add__ Guido van Rossum <guido@python.org> parents: diff changeset	7 This module exports a set of functions implemented in C corresponding\n\
0d54a14ef0b8 Operators like __add__ Guido van Rossum <guido@python.org> parents: diff changeset	8 to the intrinsic operators of Python. For example, operator.add(x, y)\n\
0d54a14ef0b8 Operators like __add__ Guido van Rossum <guido@python.org> parents: diff changeset	9 is equivalent to the expression x+y. The function names are those\n\
57210 a0951f11be3d Merged revisions 76235 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51271 diff changeset	10 used for special methods; variants without leading and trailing\n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 22805 diff changeset	11 '__' are also provided for convenience.");
3844 0d54a14ef0b8 Operators like __add__ Guido van Rossum <guido@python.org> parents: diff changeset	12
27044 23280a64288e SF patch 660559: Use METH_O and METH_NOARGS where possible Raymond Hettinger <python@rcn.com> parents: 26818 diff changeset	13 #define spam1(OP,AOP) static PyObject OP(PyObject s, PyObject *a1) { \
3844 0d54a14ef0b8 Operators like __add__ Guido van Rossum <guido@python.org> parents: diff changeset	14 return AOP(a1); }
0d54a14ef0b8 Operators like __add__ Guido van Rossum <guido@python.org> parents: diff changeset	15
13422 aa3d3bece774 ANSI-fy the sources. Fred Drake <fdrake@acm.org> parents: 9588 diff changeset	16 #define spam2(OP,AOP) static PyObject OP(PyObject s, PyObject *a) { \
3844 0d54a14ef0b8 Operators like __add__ Guido van Rossum <guido@python.org> parents: diff changeset	17 PyObject a1, a2; \
26818 e094a03a80ff SF patch #659536: Use PyArg_UnpackTuple where possible. Raymond Hettinger <python@rcn.com> parents: 24887 diff changeset	18 if(! PyArg_UnpackTuple(a,#OP,2,2,&a1,&a2)) return NULL; \
3844 0d54a14ef0b8 Operators like __add__ Guido van Rossum <guido@python.org> parents: diff changeset	19 return AOP(a1,a2); }
0d54a14ef0b8 Operators like __add__ Guido van Rossum <guido@python.org> parents: diff changeset	20
13422 aa3d3bece774 ANSI-fy the sources. Fred Drake <fdrake@acm.org> parents: 9588 diff changeset	21 #define spamoi(OP,AOP) static PyObject OP(PyObject s, PyObject *a) { \
3844 0d54a14ef0b8 Operators like __add__ Guido van Rossum <guido@python.org> parents: diff changeset	22 PyObject *a1; int a2; \
14654 0bd746bc7627 Add invert() and __invert__() as aliases for inv()/__inv__(). Fred Drake <fdrake@acm.org> parents: 13651 diff changeset	23 if(! PyArg_ParseTuple(a,"Oi:" #OP,&a1,&a2)) return NULL; \
3844 0d54a14ef0b8 Operators like __add__ Guido van Rossum <guido@python.org> parents: diff changeset	24 return AOP(a1,a2); }
0d54a14ef0b8 Operators like __add__ Guido van Rossum <guido@python.org> parents: diff changeset	25
13422 aa3d3bece774 ANSI-fy the sources. Fred Drake <fdrake@acm.org> parents: 9588 diff changeset	26 #define spam2n(OP,AOP) static PyObject OP(PyObject s, PyObject *a) { \
3844 0d54a14ef0b8 Operators like __add__ Guido van Rossum <guido@python.org> parents: diff changeset	27 PyObject a1, a2; \
26818 e094a03a80ff SF patch #659536: Use PyArg_UnpackTuple where possible. Raymond Hettinger <python@rcn.com> parents: 24887 diff changeset	28 if(! PyArg_UnpackTuple(a,#OP,2,2,&a1,&a2)) return NULL; \
3844 0d54a14ef0b8 Operators like __add__ Guido van Rossum <guido@python.org> parents: diff changeset	29 if(-1 == AOP(a1,a2)) return NULL; \
0d54a14ef0b8 Operators like __add__ Guido van Rossum <guido@python.org> parents: diff changeset	30 Py_INCREF(Py_None); \
0d54a14ef0b8 Operators like __add__ Guido van Rossum <guido@python.org> parents: diff changeset	31 return Py_None; }
0d54a14ef0b8 Operators like __add__ Guido van Rossum <guido@python.org> parents: diff changeset	32
13422 aa3d3bece774 ANSI-fy the sources. Fred Drake <fdrake@acm.org> parents: 9588 diff changeset	33 #define spam3n(OP,AOP) static PyObject OP(PyObject s, PyObject *a) { \
3844 0d54a14ef0b8 Operators like __add__ Guido van Rossum <guido@python.org> parents: diff changeset	34 PyObject a1, a2, *a3; \
26818 e094a03a80ff SF patch #659536: Use PyArg_UnpackTuple where possible. Raymond Hettinger <python@rcn.com> parents: 24887 diff changeset	35 if(! PyArg_UnpackTuple(a,#OP,3,3,&a1,&a2,&a3)) return NULL; \
3844 0d54a14ef0b8 Operators like __add__ Guido van Rossum <guido@python.org> parents: diff changeset	36 if(-1 == AOP(a1,a2,a3)) return NULL; \
0d54a14ef0b8 Operators like __add__ Guido van Rossum <guido@python.org> parents: diff changeset	37 Py_INCREF(Py_None); \
0d54a14ef0b8 Operators like __add__ Guido van Rossum <guido@python.org> parents: diff changeset	38 return Py_None; }
0d54a14ef0b8 Operators like __add__ Guido van Rossum <guido@python.org> parents: diff changeset	39
27044 23280a64288e SF patch 660559: Use METH_O and METH_NOARGS where possible Raymond Hettinger <python@rcn.com> parents: 26818 diff changeset	40 #define spami(OP,AOP) static PyObject OP(PyObject s, PyObject *a1) { \
23280a64288e SF patch 660559: Use METH_O and METH_NOARGS where possible Raymond Hettinger <python@rcn.com> parents: 26818 diff changeset	41 long r; \
3844 0d54a14ef0b8 Operators like __add__ Guido van Rossum <guido@python.org> parents: diff changeset	42 if(-1 == (r=AOP(a1))) return NULL; \
22785 aa8d59823add Add the 'bool' type and its values 'False' and 'True', as described in Guido van Rossum <guido@python.org> parents: 19111 diff changeset	43 return PyBool_FromLong(r); }
3844 0d54a14ef0b8 Operators like __add__ Guido van Rossum <guido@python.org> parents: diff changeset	44
13422 aa3d3bece774 ANSI-fy the sources. Fred Drake <fdrake@acm.org> parents: 9588 diff changeset	45 #define spami2(OP,AOP) static PyObject OP(PyObject s, PyObject *a) { \
3844 0d54a14ef0b8 Operators like __add__ Guido van Rossum <guido@python.org> parents: diff changeset	46 PyObject a1, a2; long r; \
26818 e094a03a80ff SF patch #659536: Use PyArg_UnpackTuple where possible. Raymond Hettinger <python@rcn.com> parents: 24887 diff changeset	47 if(! PyArg_UnpackTuple(a,#OP,2,2,&a1,&a2)) return NULL; \
3844 0d54a14ef0b8 Operators like __add__ Guido van Rossum <guido@python.org> parents: diff changeset	48 if(-1 == (r=AOP(a1,a2))) return NULL; \
44099 f324631462a2 Cleanup: Replaced most PyInt_ aliases with PyLong_ and disabled the aliases in intobject.h Christian Heimes <christian@cheimes.de> parents: 42334 diff changeset	49 return PyLong_FromLong(r); }
3844 0d54a14ef0b8 Operators like __add__ Guido van Rossum <guido@python.org> parents: diff changeset	50
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	51 #define spamn2(OP,AOP) static PyObject OP(PyObject s, PyObject *a) { \
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	52 PyObject a1, a2; Py_ssize_t r; \
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	53 if(! PyArg_UnpackTuple(a,#OP,2,2,&a1,&a2)) return NULL; \
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	54 if(-1 == (r=AOP(a1,a2))) return NULL; \
44099 f324631462a2 Cleanup: Replaced most PyInt_ aliases with PyLong_ and disabled the aliases in intobject.h Christian Heimes <christian@cheimes.de> parents: 42334 diff changeset	55 return PyLong_FromSsize_t(r); }
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	56
22785 aa8d59823add Add the 'bool' type and its values 'False' and 'True', as described in Guido van Rossum <guido@python.org> parents: 19111 diff changeset	57 #define spami2b(OP,AOP) static PyObject OP(PyObject s, PyObject *a) { \
aa8d59823add Add the 'bool' type and its values 'False' and 'True', as described in Guido van Rossum <guido@python.org> parents: 19111 diff changeset	58 PyObject a1, a2; long r; \
26818 e094a03a80ff SF patch #659536: Use PyArg_UnpackTuple where possible. Raymond Hettinger <python@rcn.com> parents: 24887 diff changeset	59 if(! PyArg_UnpackTuple(a,#OP,2,2,&a1,&a2)) return NULL; \
22785 aa8d59823add Add the 'bool' type and its values 'False' and 'True', as described in Guido van Rossum <guido@python.org> parents: 19111 diff changeset	60 if(-1 == (r=AOP(a1,a2))) return NULL; \
aa8d59823add Add the 'bool' type and its values 'False' and 'True', as described in Guido van Rossum <guido@python.org> parents: 19111 diff changeset	61 return PyBool_FromLong(r); }
aa8d59823add Add the 'bool' type and its values 'False' and 'True', as described in Guido van Rossum <guido@python.org> parents: 19111 diff changeset	62
19111 6ba441507220 Add wrappers around the rich-comparison operations. Fred Drake <fdrake@acm.org> parents: 14654 diff changeset	63 #define spamrc(OP,A) static PyObject OP(PyObject s, PyObject *a) { \
6ba441507220 Add wrappers around the rich-comparison operations. Fred Drake <fdrake@acm.org> parents: 14654 diff changeset	64 PyObject a1, a2; \
26818 e094a03a80ff SF patch #659536: Use PyArg_UnpackTuple where possible. Raymond Hettinger <python@rcn.com> parents: 24887 diff changeset	65 if(! PyArg_UnpackTuple(a,#OP,2,2,&a1,&a2)) return NULL; \
19111 6ba441507220 Add wrappers around the rich-comparison operations. Fred Drake <fdrake@acm.org> parents: 14654 diff changeset	66 return PyObject_RichCompare(a1,a2,A); }
6ba441507220 Add wrappers around the rich-comparison operations. Fred Drake <fdrake@acm.org> parents: 14654 diff changeset	67
3844 0d54a14ef0b8 Operators like __add__ Guido van Rossum <guido@python.org> parents: diff changeset	68 spami(truth , PyObject_IsTrue)
4089 9f70d995d027 Added delslice and delitem. Guido van Rossum <guido@python.org> parents: 4033 diff changeset	69 spam2(op_add , PyNumber_Add)
9f70d995d027 Added delslice and delitem. Guido van Rossum <guido@python.org> parents: 4033 diff changeset	70 spam2(op_sub , PyNumber_Subtract)
9f70d995d027 Added delslice and delitem. Guido van Rossum <guido@python.org> parents: 4033 diff changeset	71 spam2(op_mul , PyNumber_Multiply)
19111 6ba441507220 Add wrappers around the rich-comparison operations. Fred Drake <fdrake@acm.org> parents: 14654 diff changeset	72 spam2(op_floordiv , PyNumber_FloorDivide)
6ba441507220 Add wrappers around the rich-comparison operations. Fred Drake <fdrake@acm.org> parents: 14654 diff changeset	73 spam2(op_truediv , PyNumber_TrueDivide)
4089 9f70d995d027 Added delslice and delitem. Guido van Rossum <guido@python.org> parents: 4033 diff changeset	74 spam2(op_mod , PyNumber_Remainder)
9f70d995d027 Added delslice and delitem. Guido van Rossum <guido@python.org> parents: 4033 diff changeset	75 spam1(op_neg , PyNumber_Negative)
9f70d995d027 Added delslice and delitem. Guido van Rossum <guido@python.org> parents: 4033 diff changeset	76 spam1(op_pos , PyNumber_Positive)
9f70d995d027 Added delslice and delitem. Guido van Rossum <guido@python.org> parents: 4033 diff changeset	77 spam1(op_abs , PyNumber_Absolute)
9f70d995d027 Added delslice and delitem. Guido van Rossum <guido@python.org> parents: 4033 diff changeset	78 spam1(op_inv , PyNumber_Invert)
14654 0bd746bc7627 Add invert() and __invert__() as aliases for inv()/__inv__(). Fred Drake <fdrake@acm.org> parents: 13651 diff changeset	79 spam1(op_invert , PyNumber_Invert)
4089 9f70d995d027 Added delslice and delitem. Guido van Rossum <guido@python.org> parents: 4033 diff changeset	80 spam2(op_lshift , PyNumber_Lshift)
9f70d995d027 Added delslice and delitem. Guido van Rossum <guido@python.org> parents: 4033 diff changeset	81 spam2(op_rshift , PyNumber_Rshift)
7936 1f38a2b548bf Add not_ and __not__. Guido van Rossum <guido@python.org> parents: 6227 diff changeset	82 spami(op_not_ , PyObject_Not)
4089 9f70d995d027 Added delslice and delitem. Guido van Rossum <guido@python.org> parents: 4033 diff changeset	83 spam2(op_and_ , PyNumber_And)
9f70d995d027 Added delslice and delitem. Guido van Rossum <guido@python.org> parents: 4033 diff changeset	84 spam2(op_xor , PyNumber_Xor)
9f70d995d027 Added delslice and delitem. Guido van Rossum <guido@python.org> parents: 4033 diff changeset	85 spam2(op_or_ , PyNumber_Or)
36152 f9281283b109 adding in-place operators to the operator module. Armin Rigo <arigo@tunes.org> parents: 36149 diff changeset	86 spam2(op_iadd , PyNumber_InPlaceAdd)
f9281283b109 adding in-place operators to the operator module. Armin Rigo <arigo@tunes.org> parents: 36149 diff changeset	87 spam2(op_isub , PyNumber_InPlaceSubtract)
f9281283b109 adding in-place operators to the operator module. Armin Rigo <arigo@tunes.org> parents: 36149 diff changeset	88 spam2(op_imul , PyNumber_InPlaceMultiply)
f9281283b109 adding in-place operators to the operator module. Armin Rigo <arigo@tunes.org> parents: 36149 diff changeset	89 spam2(op_ifloordiv , PyNumber_InPlaceFloorDivide)
f9281283b109 adding in-place operators to the operator module. Armin Rigo <arigo@tunes.org> parents: 36149 diff changeset	90 spam2(op_itruediv , PyNumber_InPlaceTrueDivide)
f9281283b109 adding in-place operators to the operator module. Armin Rigo <arigo@tunes.org> parents: 36149 diff changeset	91 spam2(op_imod , PyNumber_InPlaceRemainder)
f9281283b109 adding in-place operators to the operator module. Armin Rigo <arigo@tunes.org> parents: 36149 diff changeset	92 spam2(op_ilshift , PyNumber_InPlaceLshift)
f9281283b109 adding in-place operators to the operator module. Armin Rigo <arigo@tunes.org> parents: 36149 diff changeset	93 spam2(op_irshift , PyNumber_InPlaceRshift)
f9281283b109 adding in-place operators to the operator module. Armin Rigo <arigo@tunes.org> parents: 36149 diff changeset	94 spam2(op_iand , PyNumber_InPlaceAnd)
f9281283b109 adding in-place operators to the operator module. Armin Rigo <arigo@tunes.org> parents: 36149 diff changeset	95 spam2(op_ixor , PyNumber_InPlaceXor)
f9281283b109 adding in-place operators to the operator module. Armin Rigo <arigo@tunes.org> parents: 36149 diff changeset	96 spam2(op_ior , PyNumber_InPlaceOr)
4089 9f70d995d027 Added delslice and delitem. Guido van Rossum <guido@python.org> parents: 4033 diff changeset	97 spam2(op_concat , PySequence_Concat)
36152 f9281283b109 adding in-place operators to the operator module. Armin Rigo <arigo@tunes.org> parents: 36149 diff changeset	98 spam2(op_iconcat , PySequence_InPlaceConcat)
22785 aa8d59823add Add the 'bool' type and its values 'False' and 'True', as described in Guido van Rossum <guido@python.org> parents: 19111 diff changeset	99 spami2b(op_contains , PySequence_Contains)
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	100 spamn2(indexOf , PySequence_Index)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	101 spamn2(countOf , PySequence_Count)
4089 9f70d995d027 Added delslice and delitem. Guido van Rossum <guido@python.org> parents: 4033 diff changeset	102 spam2(op_getitem , PyObject_GetItem)
9f70d995d027 Added delslice and delitem. Guido van Rossum <guido@python.org> parents: 4033 diff changeset	103 spam2n(op_delitem , PyObject_DelItem)
9f70d995d027 Added delslice and delitem. Guido van Rossum <guido@python.org> parents: 4033 diff changeset	104 spam3n(op_setitem , PyObject_SetItem)
19111 6ba441507220 Add wrappers around the rich-comparison operations. Fred Drake <fdrake@acm.org> parents: 14654 diff changeset	105 spamrc(op_lt , Py_LT)
6ba441507220 Add wrappers around the rich-comparison operations. Fred Drake <fdrake@acm.org> parents: 14654 diff changeset	106 spamrc(op_le , Py_LE)
6ba441507220 Add wrappers around the rich-comparison operations. Fred Drake <fdrake@acm.org> parents: 14654 diff changeset	107 spamrc(op_eq , Py_EQ)
6ba441507220 Add wrappers around the rich-comparison operations. Fred Drake <fdrake@acm.org> parents: 14654 diff changeset	108 spamrc(op_ne , Py_NE)
6ba441507220 Add wrappers around the rich-comparison operations. Fred Drake <fdrake@acm.org> parents: 14654 diff changeset	109 spamrc(op_gt , Py_GT)
6ba441507220 Add wrappers around the rich-comparison operations. Fred Drake <fdrake@acm.org> parents: 14654 diff changeset	110 spamrc(op_ge , Py_GE)
3844 0d54a14ef0b8 Operators like __add__ Guido van Rossum <guido@python.org> parents: diff changeset	111
0d54a14ef0b8 Operators like __add__ Guido van Rossum <guido@python.org> parents: diff changeset	112 static PyObject*
24887 d797cfa8ca0d Added __pow__(a,b) to the operator module. Completes the pattern of Raymond Hettinger <python@rcn.com> parents: 24796 diff changeset	113 op_pow(PyObject s, PyObject a)
d797cfa8ca0d Added __pow__(a,b) to the operator module. Completes the pattern of Raymond Hettinger <python@rcn.com> parents: 24796 diff changeset	114 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	115 PyObject a1, a2;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	116 if (PyArg_UnpackTuple(a,"pow", 2, 2, &a1, &a2))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	117 return PyNumber_Power(a1, a2, Py_None);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	118 return NULL;
24887 d797cfa8ca0d Added __pow__(a,b) to the operator module. Completes the pattern of Raymond Hettinger <python@rcn.com> parents: 24796 diff changeset	119 }
d797cfa8ca0d Added __pow__(a,b) to the operator module. Completes the pattern of Raymond Hettinger <python@rcn.com> parents: 24796 diff changeset	120
d797cfa8ca0d Added __pow__(a,b) to the operator module. Completes the pattern of Raymond Hettinger <python@rcn.com> parents: 24796 diff changeset	121 static PyObject*
36152 f9281283b109 adding in-place operators to the operator module. Armin Rigo <arigo@tunes.org> parents: 36149 diff changeset	122 op_ipow(PyObject s, PyObject a)
f9281283b109 adding in-place operators to the operator module. Armin Rigo <arigo@tunes.org> parents: 36149 diff changeset	123 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	124 PyObject a1, a2;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	125 if (PyArg_UnpackTuple(a,"ipow", 2, 2, &a1, &a2))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	126 return PyNumber_InPlacePower(a1, a2, Py_None);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	127 return NULL;
36152 f9281283b109 adding in-place operators to the operator module. Armin Rigo <arigo@tunes.org> parents: 36149 diff changeset	128 }
f9281283b109 adding in-place operators to the operator module. Armin Rigo <arigo@tunes.org> parents: 36149 diff changeset	129
36882 6a9c7165b17b Checking in the code for PEP 357. Guido van Rossum <guido@python.org> parents: 36518 diff changeset	130 static PyObject *
6a9c7165b17b Checking in the code for PEP 357. Guido van Rossum <guido@python.org> parents: 36518 diff changeset	131 op_index(PyObject s, PyObject a)
6a9c7165b17b Checking in the code for PEP 357. Guido van Rossum <guido@python.org> parents: 36518 diff changeset	132 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	133 return PyNumber_Index(a);
36882 6a9c7165b17b Checking in the code for PEP 357. Guido van Rossum <guido@python.org> parents: 36518 diff changeset	134 }
6a9c7165b17b Checking in the code for PEP 357. Guido van Rossum <guido@python.org> parents: 36518 diff changeset	135
36152 f9281283b109 adding in-place operators to the operator module. Armin Rigo <arigo@tunes.org> parents: 36149 diff changeset	136 static PyObject*
27290 e83a42a90df1 SF patch #670423: Add missing identity tests to operator.c Raymond Hettinger <python@rcn.com> parents: 27044 diff changeset	137 is_(PyObject s, PyObject a)
e83a42a90df1 SF patch #670423: Add missing identity tests to operator.c Raymond Hettinger <python@rcn.com> parents: 27044 diff changeset	138 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	139 PyObject a1, a2, *result = NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	140 if (PyArg_UnpackTuple(a,"is_", 2, 2, &a1, &a2)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	141 result = (a1 == a2) ? Py_True : Py_False;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	142 Py_INCREF(result);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	143 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	144 return result;
27290 e83a42a90df1 SF patch #670423: Add missing identity tests to operator.c Raymond Hettinger <python@rcn.com> parents: 27044 diff changeset	145 }
e83a42a90df1 SF patch #670423: Add missing identity tests to operator.c Raymond Hettinger <python@rcn.com> parents: 27044 diff changeset	146
e83a42a90df1 SF patch #670423: Add missing identity tests to operator.c Raymond Hettinger <python@rcn.com> parents: 27044 diff changeset	147 static PyObject*
e83a42a90df1 SF patch #670423: Add missing identity tests to operator.c Raymond Hettinger <python@rcn.com> parents: 27044 diff changeset	148 is_not(PyObject s, PyObject a)
e83a42a90df1 SF patch #670423: Add missing identity tests to operator.c Raymond Hettinger <python@rcn.com> parents: 27044 diff changeset	149 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	150 PyObject a1, a2, *result = NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	151 if (PyArg_UnpackTuple(a,"is_not", 2, 2, &a1, &a2)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	152 result = (a1 != a2) ? Py_True : Py_False;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	153 Py_INCREF(result);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	154 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	155 return result;
27290 e83a42a90df1 SF patch #670423: Add missing identity tests to operator.c Raymond Hettinger <python@rcn.com> parents: 27044 diff changeset	156 }
e83a42a90df1 SF patch #670423: Add missing identity tests to operator.c Raymond Hettinger <python@rcn.com> parents: 27044 diff changeset	157
3844 0d54a14ef0b8 Operators like __add__ Guido van Rossum <guido@python.org> parents: diff changeset	158 #undef spam1
0d54a14ef0b8 Operators like __add__ Guido van Rossum <guido@python.org> parents: diff changeset	159 #undef spam2
27044 23280a64288e SF patch 660559: Use METH_O and METH_NOARGS where possible Raymond Hettinger <python@rcn.com> parents: 26818 diff changeset	160 #undef spam1o
23280a64288e SF patch 660559: Use METH_O and METH_NOARGS where possible Raymond Hettinger <python@rcn.com> parents: 26818 diff changeset	161 #undef spam1o
24796 de71e6fe64b0 Allow more docstrings to be removed during compilation in some modules Neal Norwitz <nnorwitz@gmail.com> parents: 24471 diff changeset	162 #define spam1(OP,DOC) {#OP, OP, METH_VARARGS, PyDoc_STR(DOC)},
36149 e44a833eca43 two missing PyDoc_STR(). Armin Rigo <arigo@tunes.org> parents: 35449 diff changeset	163 #define spam2(OP,ALTOP,DOC) {#OP, op_##OP, METH_VARARGS, PyDoc_STR(DOC)}, \
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	164 {#ALTOP, op_##OP, METH_VARARGS, PyDoc_STR(DOC)},
27044 23280a64288e SF patch 660559: Use METH_O and METH_NOARGS where possible Raymond Hettinger <python@rcn.com> parents: 26818 diff changeset	165 #define spam1o(OP,DOC) {#OP, OP, METH_O, PyDoc_STR(DOC)},
36149 e44a833eca43 two missing PyDoc_STR(). Armin Rigo <arigo@tunes.org> parents: 35449 diff changeset	166 #define spam2o(OP,ALTOP,DOC) {#OP, op_##OP, METH_O, PyDoc_STR(DOC)}, \
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	167 {#ALTOP, op_##OP, METH_O, PyDoc_STR(DOC)},
3844 0d54a14ef0b8 Operators like __add__ Guido van Rossum <guido@python.org> parents: diff changeset	168
0d54a14ef0b8 Operators like __add__ Guido van Rossum <guido@python.org> parents: diff changeset	169 static struct PyMethodDef operator_methods[] = {
0d54a14ef0b8 Operators like __add__ Guido van Rossum <guido@python.org> parents: diff changeset	170
27044 23280a64288e SF patch 660559: Use METH_O and METH_NOARGS where possible Raymond Hettinger <python@rcn.com> parents: 26818 diff changeset	171 spam1o(truth,
22785 aa8d59823add Add the 'bool' type and its values 'False' and 'True', as described in Guido van Rossum <guido@python.org> parents: 19111 diff changeset	172 "truth(a) -- Return True if a is true, False otherwise.")
14654 0bd746bc7627 Add invert() and __invert__() as aliases for inv()/__inv__(). Fred Drake <fdrake@acm.org> parents: 13651 diff changeset	173 spam2(contains,__contains__,
8414 4064b6729537 Add an alias (and preferred name) "contains" for "sequenceIncludes". Guido van Rossum <guido@python.org> parents: 8406 diff changeset	174 "contains(a, b) -- Same as b in a (note reversed operands).")
4033 5592de9656de Made it palatable for K&R preprocessors. The spam macros don't have Guido van Rossum <guido@python.org> parents: 3976 diff changeset	175 spam1(indexOf,
8414 4064b6729537 Add an alias (and preferred name) "contains" for "sequenceIncludes". Guido van Rossum <guido@python.org> parents: 8406 diff changeset	176 "indexOf(a, b) -- Return the first index of b in a.")
4033 5592de9656de Made it palatable for K&R preprocessors. The spam macros don't have Guido van Rossum <guido@python.org> parents: 3976 diff changeset	177 spam1(countOf,
5592de9656de Made it palatable for K&R preprocessors. The spam macros don't have Guido van Rossum <guido@python.org> parents: 3976 diff changeset	178 "countOf(a, b) -- Return the number of times b occurs in a.")
3844 0d54a14ef0b8 Operators like __add__ Guido van Rossum <guido@python.org> parents: diff changeset	179
27290 e83a42a90df1 SF patch #670423: Add missing identity tests to operator.c Raymond Hettinger <python@rcn.com> parents: 27044 diff changeset	180 spam1(is_, "is_(a, b) -- Same as a is b.")
e83a42a90df1 SF patch #670423: Add missing identity tests to operator.c Raymond Hettinger <python@rcn.com> parents: 27044 diff changeset	181 spam1(is_not, "is_not(a, b) -- Same as a is not b.")
39610 3674f20ac781 Merge current trunk into p3yk. This includes the PyNumber_Index API change, Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	182 spam2o(index, __index__, "index(a) -- Same as a.__index__()")
8414 4064b6729537 Add an alias (and preferred name) "contains" for "sequenceIncludes". Guido van Rossum <guido@python.org> parents: 8406 diff changeset	183 spam2(add,__add__, "add(a, b) -- Same as a + b.")
4064b6729537 Add an alias (and preferred name) "contains" for "sequenceIncludes". Guido van Rossum <guido@python.org> parents: 8406 diff changeset	184 spam2(sub,__sub__, "sub(a, b) -- Same as a - b.")
4064b6729537 Add an alias (and preferred name) "contains" for "sequenceIncludes". Guido van Rossum <guido@python.org> parents: 8406 diff changeset	185 spam2(mul,__mul__, "mul(a, b) -- Same as a * b.")
19111 6ba441507220 Add wrappers around the rich-comparison operations. Fred Drake <fdrake@acm.org> parents: 14654 diff changeset	186 spam2(floordiv,__floordiv__, "floordiv(a, b) -- Same as a // b.")
37191 4bfe8afe8f65 Get rid of remnants of integer division Neal Norwitz <nnorwitz@gmail.com> parents: 36882 diff changeset	187 spam2(truediv,__truediv__, "truediv(a, b) -- Same as a / b.")
8414 4064b6729537 Add an alias (and preferred name) "contains" for "sequenceIncludes". Guido van Rossum <guido@python.org> parents: 8406 diff changeset	188 spam2(mod,__mod__, "mod(a, b) -- Same as a % b.")
27044 23280a64288e SF patch 660559: Use METH_O and METH_NOARGS where possible Raymond Hettinger <python@rcn.com> parents: 26818 diff changeset	189 spam2o(neg,__neg__, "neg(a) -- Same as -a.")
23280a64288e SF patch 660559: Use METH_O and METH_NOARGS where possible Raymond Hettinger <python@rcn.com> parents: 26818 diff changeset	190 spam2o(pos,__pos__, "pos(a) -- Same as +a.")
23280a64288e SF patch 660559: Use METH_O and METH_NOARGS where possible Raymond Hettinger <python@rcn.com> parents: 26818 diff changeset	191 spam2o(abs,__abs__, "abs(a) -- Same as abs(a).")
23280a64288e SF patch 660559: Use METH_O and METH_NOARGS where possible Raymond Hettinger <python@rcn.com> parents: 26818 diff changeset	192 spam2o(inv,__inv__, "inv(a) -- Same as ~a.")
23280a64288e SF patch 660559: Use METH_O and METH_NOARGS where possible Raymond Hettinger <python@rcn.com> parents: 26818 diff changeset	193 spam2o(invert,__invert__, "invert(a) -- Same as ~a.")
8414 4064b6729537 Add an alias (and preferred name) "contains" for "sequenceIncludes". Guido van Rossum <guido@python.org> parents: 8406 diff changeset	194 spam2(lshift,__lshift__, "lshift(a, b) -- Same as a << b.")
4064b6729537 Add an alias (and preferred name) "contains" for "sequenceIncludes". Guido van Rossum <guido@python.org> parents: 8406 diff changeset	195 spam2(rshift,__rshift__, "rshift(a, b) -- Same as a >> b.")
27044 23280a64288e SF patch 660559: Use METH_O and METH_NOARGS where possible Raymond Hettinger <python@rcn.com> parents: 26818 diff changeset	196 spam2o(not_,__not__, "not_(a) -- Same as not a.")
8414 4064b6729537 Add an alias (and preferred name) "contains" for "sequenceIncludes". Guido van Rossum <guido@python.org> parents: 8406 diff changeset	197 spam2(and_,__and__, "and_(a, b) -- Same as a & b.")
4064b6729537 Add an alias (and preferred name) "contains" for "sequenceIncludes". Guido van Rossum <guido@python.org> parents: 8406 diff changeset	198 spam2(xor,__xor__, "xor(a, b) -- Same as a ^ b.")
4064b6729537 Add an alias (and preferred name) "contains" for "sequenceIncludes". Guido van Rossum <guido@python.org> parents: 8406 diff changeset	199 spam2(or_,__or__, "or_(a, b) -- Same as a \| b.")
57210 a0951f11be3d Merged revisions 76235 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51271 diff changeset	200 spam2(iadd,__iadd__, "a = iadd(a, b) -- Same as a += b.")
a0951f11be3d Merged revisions 76235 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51271 diff changeset	201 spam2(isub,__isub__, "a = isub(a, b) -- Same as a -= b.")
a0951f11be3d Merged revisions 76235 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51271 diff changeset	202 spam2(imul,__imul__, "a = imul(a, b) -- Same as a *= b.")
a0951f11be3d Merged revisions 76235 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51271 diff changeset	203 spam2(ifloordiv,__ifloordiv__, "a = ifloordiv(a, b) -- Same as a //= b.")
a0951f11be3d Merged revisions 76235 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51271 diff changeset	204 spam2(itruediv,__itruediv__, "a = itruediv(a, b) -- Same as a /= b")
a0951f11be3d Merged revisions 76235 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51271 diff changeset	205 spam2(imod,__imod__, "a = imod(a, b) -- Same as a %= b.")
a0951f11be3d Merged revisions 76235 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51271 diff changeset	206 spam2(ilshift,__ilshift__, "a = ilshift(a, b) -- Same as a <<= b.")
a0951f11be3d Merged revisions 76235 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51271 diff changeset	207 spam2(irshift,__irshift__, "a = irshift(a, b) -- Same as a >>= b.")
a0951f11be3d Merged revisions 76235 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51271 diff changeset	208 spam2(iand,__iand__, "a = iand(a, b) -- Same as a &= b.")
a0951f11be3d Merged revisions 76235 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51271 diff changeset	209 spam2(ixor,__ixor__, "a = ixor(a, b) -- Same as a ^= b.")
a0951f11be3d Merged revisions 76235 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51271 diff changeset	210 spam2(ior,__ior__, "a = ior(a, b) -- Same as a \|= b.")
4033 5592de9656de Made it palatable for K&R preprocessors. The spam macros don't have Guido van Rossum <guido@python.org> parents: 3976 diff changeset	211 spam2(concat,__concat__,
8414 4064b6729537 Add an alias (and preferred name) "contains" for "sequenceIncludes". Guido van Rossum <guido@python.org> parents: 8406 diff changeset	212 "concat(a, b) -- Same as a + b, for a and b sequences.")
36152 f9281283b109 adding in-place operators to the operator module. Armin Rigo <arigo@tunes.org> parents: 36149 diff changeset	213 spam2(iconcat,__iconcat__,
57210 a0951f11be3d Merged revisions 76235 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51271 diff changeset	214 "a = iconcat(a, b) -- Same as a += b, for a and b sequences.")
4033 5592de9656de Made it palatable for K&R preprocessors. The spam macros don't have Guido van Rossum <guido@python.org> parents: 3976 diff changeset	215 spam2(getitem,__getitem__,
8414 4064b6729537 Add an alias (and preferred name) "contains" for "sequenceIncludes". Guido van Rossum <guido@python.org> parents: 8406 diff changeset	216 "getitem(a, b) -- Same as a[b].")
4033 5592de9656de Made it palatable for K&R preprocessors. The spam macros don't have Guido van Rossum <guido@python.org> parents: 3976 diff changeset	217 spam2(setitem,__setitem__,
8414 4064b6729537 Add an alias (and preferred name) "contains" for "sequenceIncludes". Guido van Rossum <guido@python.org> parents: 8406 diff changeset	218 "setitem(a, b, c) -- Same as a[b] = c.")
4089 9f70d995d027 Added delslice and delitem. Guido van Rossum <guido@python.org> parents: 4033 diff changeset	219 spam2(delitem,__delitem__,
8414 4064b6729537 Add an alias (and preferred name) "contains" for "sequenceIncludes". Guido van Rossum <guido@python.org> parents: 8406 diff changeset	220 "delitem(a, b) -- Same as del a[b].")
36152 f9281283b109 adding in-place operators to the operator module. Armin Rigo <arigo@tunes.org> parents: 36149 diff changeset	221 spam2(pow,__pow__, "pow(a, b) -- Same as a ** b.")
57210 a0951f11be3d Merged revisions 76235 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51271 diff changeset	222 spam2(ipow,__ipow__, "a = ipow(a, b) -- Same as a **= b.")
19111 6ba441507220 Add wrappers around the rich-comparison operations. Fred Drake <fdrake@acm.org> parents: 14654 diff changeset	223 spam2(lt,__lt__, "lt(a, b) -- Same as a<b.")
6ba441507220 Add wrappers around the rich-comparison operations. Fred Drake <fdrake@acm.org> parents: 14654 diff changeset	224 spam2(le,__le__, "le(a, b) -- Same as a<=b.")
6ba441507220 Add wrappers around the rich-comparison operations. Fred Drake <fdrake@acm.org> parents: 14654 diff changeset	225 spam2(eq,__eq__, "eq(a, b) -- Same as a==b.")
6ba441507220 Add wrappers around the rich-comparison operations. Fred Drake <fdrake@acm.org> parents: 14654 diff changeset	226 spam2(ne,__ne__, "ne(a, b) -- Same as a!=b.")
6ba441507220 Add wrappers around the rich-comparison operations. Fred Drake <fdrake@acm.org> parents: 14654 diff changeset	227 spam2(gt,__gt__, "gt(a, b) -- Same as a>b.")
6ba441507220 Add wrappers around the rich-comparison operations. Fred Drake <fdrake@acm.org> parents: 14654 diff changeset	228 spam2(ge,__ge__, "ge(a, b) -- Same as a>=b.")
4033 5592de9656de Made it palatable for K&R preprocessors. The spam macros don't have Guido van Rossum <guido@python.org> parents: 3976 diff changeset	229
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	230 {NULL, NULL} /* sentinel */
3844 0d54a14ef0b8 Operators like __add__ Guido van Rossum <guido@python.org> parents: diff changeset	231
0d54a14ef0b8 Operators like __add__ Guido van Rossum <guido@python.org> parents: diff changeset	232 };
0d54a14ef0b8 Operators like __add__ Guido van Rossum <guido@python.org> parents: diff changeset	233
31052 456e274f8602 As discussed on python-dev, added two extractor functions to the Raymond Hettinger <python@rcn.com> parents: 27290 diff changeset	234 /* itemgetter object **********************************************************/
3844 0d54a14ef0b8 Operators like __add__ Guido van Rossum <guido@python.org> parents: diff changeset	235
31052 456e274f8602 As discussed on python-dev, added two extractor functions to the Raymond Hettinger <python@rcn.com> parents: 27290 diff changeset	236 typedef struct {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	237 PyObject_HEAD
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	238 Py_ssize_t nitems;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	239 PyObject *item;
31052 456e274f8602 As discussed on python-dev, added two extractor functions to the Raymond Hettinger <python@rcn.com> parents: 27290 diff changeset	240 } itemgetterobject;
456e274f8602 As discussed on python-dev, added two extractor functions to the Raymond Hettinger <python@rcn.com> parents: 27290 diff changeset	241
456e274f8602 As discussed on python-dev, added two extractor functions to the Raymond Hettinger <python@rcn.com> parents: 27290 diff changeset	242 static PyTypeObject itemgetter_type;
456e274f8602 As discussed on python-dev, added two extractor functions to the Raymond Hettinger <python@rcn.com> parents: 27290 diff changeset	243
456e274f8602 As discussed on python-dev, added two extractor functions to the Raymond Hettinger <python@rcn.com> parents: 27290 diff changeset	244 static PyObject *
456e274f8602 As discussed on python-dev, added two extractor functions to the Raymond Hettinger <python@rcn.com> parents: 27290 diff changeset	245 itemgetter_new(PyTypeObject type, PyObject args, PyObject *kwds)
456e274f8602 As discussed on python-dev, added two extractor functions to the Raymond Hettinger <python@rcn.com> parents: 27290 diff changeset	246 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	247 itemgetterobject *ig;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	248 PyObject *item;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	249 Py_ssize_t nitems;
31052 456e274f8602 As discussed on python-dev, added two extractor functions to the Raymond Hettinger <python@rcn.com> parents: 27290 diff changeset	250
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	251 if (!_PyArg_NoKeywords("itemgetter()", kwds))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	252 return NULL;
35449 1fdfd0130e28 Disallow keyword arguments for type constructors that don't use them. Georg Brandl <georg@python.org> parents: 34716 diff changeset	253
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	254 nitems = PyTuple_GET_SIZE(args);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	255 if (nitems <= 1) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	256 if (!PyArg_UnpackTuple(args, "itemgetter", 1, 1, &item))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	257 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	258 } else
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	259 item = args;
31052 456e274f8602 As discussed on python-dev, added two extractor functions to the Raymond Hettinger <python@rcn.com> parents: 27290 diff changeset	260
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	261 /* create itemgetterobject structure */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	262 ig = PyObject_GC_New(itemgetterobject, &itemgetter_type);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	263 if (ig == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	264 return NULL;
31052 456e274f8602 As discussed on python-dev, added two extractor functions to the Raymond Hettinger <python@rcn.com> parents: 27290 diff changeset	265
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	266 Py_INCREF(item);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	267 ig->item = item;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	268 ig->nitems = nitems;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	269
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	270 PyObject_GC_Track(ig);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	271 return (PyObject *)ig;
31052 456e274f8602 As discussed on python-dev, added two extractor functions to the Raymond Hettinger <python@rcn.com> parents: 27290 diff changeset	272 }
456e274f8602 As discussed on python-dev, added two extractor functions to the Raymond Hettinger <python@rcn.com> parents: 27290 diff changeset	273
456e274f8602 As discussed on python-dev, added two extractor functions to the Raymond Hettinger <python@rcn.com> parents: 27290 diff changeset	274 static void
456e274f8602 As discussed on python-dev, added two extractor functions to the Raymond Hettinger <python@rcn.com> parents: 27290 diff changeset	275 itemgetter_dealloc(itemgetterobject *ig)
456e274f8602 As discussed on python-dev, added two extractor functions to the Raymond Hettinger <python@rcn.com> parents: 27290 diff changeset	276 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	277 PyObject_GC_UnTrack(ig);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	278 Py_XDECREF(ig->item);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	279 PyObject_GC_Del(ig);
31052 456e274f8602 As discussed on python-dev, added two extractor functions to the Raymond Hettinger <python@rcn.com> parents: 27290 diff changeset	280 }
456e274f8602 As discussed on python-dev, added two extractor functions to the Raymond Hettinger <python@rcn.com> parents: 27290 diff changeset	281
456e274f8602 As discussed on python-dev, added two extractor functions to the Raymond Hettinger <python@rcn.com> parents: 27290 diff changeset	282 static int
456e274f8602 As discussed on python-dev, added two extractor functions to the Raymond Hettinger <python@rcn.com> parents: 27290 diff changeset	283 itemgetter_traverse(itemgetterobject ig, visitproc visit, void arg)
456e274f8602 As discussed on python-dev, added two extractor functions to the Raymond Hettinger <python@rcn.com> parents: 27290 diff changeset	284 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	285 Py_VISIT(ig->item);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	286 return 0;
31052 456e274f8602 As discussed on python-dev, added two extractor functions to the Raymond Hettinger <python@rcn.com> parents: 27290 diff changeset	287 }
456e274f8602 As discussed on python-dev, added two extractor functions to the Raymond Hettinger <python@rcn.com> parents: 27290 diff changeset	288
456e274f8602 As discussed on python-dev, added two extractor functions to the Raymond Hettinger <python@rcn.com> parents: 27290 diff changeset	289 static PyObject *
456e274f8602 As discussed on python-dev, added two extractor functions to the Raymond Hettinger <python@rcn.com> parents: 27290 diff changeset	290 itemgetter_call(itemgetterobject ig, PyObject args, PyObject *kw)
456e274f8602 As discussed on python-dev, added two extractor functions to the Raymond Hettinger <python@rcn.com> parents: 27290 diff changeset	291 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	292 PyObject obj, result;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	293 Py_ssize_t i, nitems=ig->nitems;
31052 456e274f8602 As discussed on python-dev, added two extractor functions to the Raymond Hettinger <python@rcn.com> parents: 27290 diff changeset	294
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	295 if (!PyArg_UnpackTuple(args, "itemgetter", 1, 1, &obj))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	296 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	297 if (nitems == 1)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	298 return PyObject_GetItem(obj, ig->item);
34716 ddc2276c247e operator.itemgetter() and operator.attrgetter() now support extraction Raymond Hettinger <python@rcn.com> parents: 31110 diff changeset	299
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	300 assert(PyTuple_Check(ig->item));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	301 assert(PyTuple_GET_SIZE(ig->item) == nitems);
34716 ddc2276c247e operator.itemgetter() and operator.attrgetter() now support extraction Raymond Hettinger <python@rcn.com> parents: 31110 diff changeset	302
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	303 result = PyTuple_New(nitems);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	304 if (result == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	305 return NULL;
34716 ddc2276c247e operator.itemgetter() and operator.attrgetter() now support extraction Raymond Hettinger <python@rcn.com> parents: 31110 diff changeset	306
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	307 for (i=0 ; i < nitems ; i++) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	308 PyObject item, val;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	309 item = PyTuple_GET_ITEM(ig->item, i);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	310 val = PyObject_GetItem(obj, item);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	311 if (val == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	312 Py_DECREF(result);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	313 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	314 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	315 PyTuple_SET_ITEM(result, i, val);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	316 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	317 return result;
31052 456e274f8602 As discussed on python-dev, added two extractor functions to the Raymond Hettinger <python@rcn.com> parents: 27290 diff changeset	318 }
456e274f8602 As discussed on python-dev, added two extractor functions to the Raymond Hettinger <python@rcn.com> parents: 27290 diff changeset	319
456e274f8602 As discussed on python-dev, added two extractor functions to the Raymond Hettinger <python@rcn.com> parents: 27290 diff changeset	320 PyDoc_STRVAR(itemgetter_doc,
34716 ddc2276c247e operator.itemgetter() and operator.attrgetter() now support extraction Raymond Hettinger <python@rcn.com> parents: 31110 diff changeset	321 "itemgetter(item, ...) --> itemgetter object\n\
31052 456e274f8602 As discussed on python-dev, added two extractor functions to the Raymond Hettinger <python@rcn.com> parents: 27290 diff changeset	322 \n\
34716 ddc2276c247e operator.itemgetter() and operator.attrgetter() now support extraction Raymond Hettinger <python@rcn.com> parents: 31110 diff changeset	323 Return a callable object that fetches the given item(s) from its operand.\n\
ddc2276c247e operator.itemgetter() and operator.attrgetter() now support extraction Raymond Hettinger <python@rcn.com> parents: 31110 diff changeset	324 After, f=itemgetter(2), the call f(r) returns r[2].\n\
ddc2276c247e operator.itemgetter() and operator.attrgetter() now support extraction Raymond Hettinger <python@rcn.com> parents: 31110 diff changeset	325 After, g=itemgetter(2,5,3), the call g(r) returns (r[2], r[5], r[3])");
31052 456e274f8602 As discussed on python-dev, added two extractor functions to the Raymond Hettinger <python@rcn.com> parents: 27290 diff changeset	326
456e274f8602 As discussed on python-dev, added two extractor functions to the Raymond Hettinger <python@rcn.com> parents: 27290 diff changeset	327 static PyTypeObject itemgetter_type = {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	328 PyVarObject_HEAD_INIT(NULL, 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	329 "operator.itemgetter", /* tp_name */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	330 sizeof(itemgetterobject), /* tp_basicsize */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	331 0, /* tp_itemsize */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	332 /* methods */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	333 (destructor)itemgetter_dealloc, /* tp_dealloc */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	334 0, /* tp_print */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	335 0, /* tp_getattr */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	336 0, /* tp_setattr */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	337 0, /* tp_reserved */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	338 0, /* tp_repr */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	339 0, /* tp_as_number */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	340 0, /* tp_as_sequence */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	341 0, /* tp_as_mapping */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	342 0, /* tp_hash */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	343 (ternaryfunc)itemgetter_call, /* tp_call */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	344 0, /* tp_str */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	345 PyObject_GenericGetAttr, /* tp_getattro */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	346 0, /* tp_setattro */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	347 0, /* tp_as_buffer */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	348 Py_TPFLAGS_DEFAULT \| Py_TPFLAGS_HAVE_GC, /* tp_flags */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	349 itemgetter_doc, /* tp_doc */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	350 (traverseproc)itemgetter_traverse, /* tp_traverse */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	351 0, /* tp_clear */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	352 0, /* tp_richcompare */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	353 0, /* tp_weaklistoffset */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	354 0, /* tp_iter */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	355 0, /* tp_iternext */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	356 0, /* tp_methods */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	357 0, /* tp_members */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	358 0, /* tp_getset */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	359 0, /* tp_base */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	360 0, /* tp_dict */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	361 0, /* tp_descr_get */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	362 0, /* tp_descr_set */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	363 0, /* tp_dictoffset */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	364 0, /* tp_init */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	365 0, /* tp_alloc */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	366 itemgetter_new, /* tp_new */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	367 0, /* tp_free */
31052 456e274f8602 As discussed on python-dev, added two extractor functions to the Raymond Hettinger <python@rcn.com> parents: 27290 diff changeset	368 };
456e274f8602 As discussed on python-dev, added two extractor functions to the Raymond Hettinger <python@rcn.com> parents: 27290 diff changeset	369
456e274f8602 As discussed on python-dev, added two extractor functions to the Raymond Hettinger <python@rcn.com> parents: 27290 diff changeset	370
456e274f8602 As discussed on python-dev, added two extractor functions to the Raymond Hettinger <python@rcn.com> parents: 27290 diff changeset	371 /* attrgetter object **********************************************************/
456e274f8602 As discussed on python-dev, added two extractor functions to the Raymond Hettinger <python@rcn.com> parents: 27290 diff changeset	372
456e274f8602 As discussed on python-dev, added two extractor functions to the Raymond Hettinger <python@rcn.com> parents: 27290 diff changeset	373 typedef struct {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	374 PyObject_HEAD
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	375 Py_ssize_t nattrs;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	376 PyObject *attr;
31052 456e274f8602 As discussed on python-dev, added two extractor functions to the Raymond Hettinger <python@rcn.com> parents: 27290 diff changeset	377 } attrgetterobject;
456e274f8602 As discussed on python-dev, added two extractor functions to the Raymond Hettinger <python@rcn.com> parents: 27290 diff changeset	378
456e274f8602 As discussed on python-dev, added two extractor functions to the Raymond Hettinger <python@rcn.com> parents: 27290 diff changeset	379 static PyTypeObject attrgetter_type;
456e274f8602 As discussed on python-dev, added two extractor functions to the Raymond Hettinger <python@rcn.com> parents: 27290 diff changeset	380
456e274f8602 As discussed on python-dev, added two extractor functions to the Raymond Hettinger <python@rcn.com> parents: 27290 diff changeset	381 static PyObject *
456e274f8602 As discussed on python-dev, added two extractor functions to the Raymond Hettinger <python@rcn.com> parents: 27290 diff changeset	382 attrgetter_new(PyTypeObject type, PyObject args, PyObject *kwds)
456e274f8602 As discussed on python-dev, added two extractor functions to the Raymond Hettinger <python@rcn.com> parents: 27290 diff changeset	383 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	384 attrgetterobject *ag;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	385 PyObject *attr;
65818 4127ab1f6338 Issue #10160: Speed up operator.attrgetter. Patch by Christos Georgiou. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	386 Py_ssize_t nattrs, idx, char_idx;
31052 456e274f8602 As discussed on python-dev, added two extractor functions to the Raymond Hettinger <python@rcn.com> parents: 27290 diff changeset	387
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	388 if (!_PyArg_NoKeywords("attrgetter()", kwds))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	389 return NULL;
35449 1fdfd0130e28 Disallow keyword arguments for type constructors that don't use them. Georg Brandl <georg@python.org> parents: 34716 diff changeset	390
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	391 nattrs = PyTuple_GET_SIZE(args);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	392 if (nattrs <= 1) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	393 if (!PyArg_UnpackTuple(args, "attrgetter", 1, 1, &attr))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	394 return NULL;
65818 4127ab1f6338 Issue #10160: Speed up operator.attrgetter. Patch by Christos Georgiou. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	395 }
4127ab1f6338 Issue #10160: Speed up operator.attrgetter. Patch by Christos Georgiou. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	396
4127ab1f6338 Issue #10160: Speed up operator.attrgetter. Patch by Christos Georgiou. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	397 attr = PyTuple_New(nattrs);
4127ab1f6338 Issue #10160: Speed up operator.attrgetter. Patch by Christos Georgiou. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	398 if (attr == NULL)
4127ab1f6338 Issue #10160: Speed up operator.attrgetter. Patch by Christos Georgiou. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	399 return NULL;
4127ab1f6338 Issue #10160: Speed up operator.attrgetter. Patch by Christos Georgiou. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	400
4127ab1f6338 Issue #10160: Speed up operator.attrgetter. Patch by Christos Georgiou. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	401 /* prepare attr while checking args */
4127ab1f6338 Issue #10160: Speed up operator.attrgetter. Patch by Christos Georgiou. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	402 for (idx = 0; idx < nattrs; ++idx) {
4127ab1f6338 Issue #10160: Speed up operator.attrgetter. Patch by Christos Georgiou. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	403 PyObject *item = PyTuple_GET_ITEM(args, idx);
4127ab1f6338 Issue #10160: Speed up operator.attrgetter. Patch by Christos Georgiou. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	404 Py_ssize_t item_len;
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 65842 diff changeset	405 void *data;
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 65842 diff changeset	406 unsigned int kind;
65818 4127ab1f6338 Issue #10160: Speed up operator.attrgetter. Patch by Christos Georgiou. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	407 int dot_count;
4127ab1f6338 Issue #10160: Speed up operator.attrgetter. Patch by Christos Georgiou. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	408
4127ab1f6338 Issue #10160: Speed up operator.attrgetter. Patch by Christos Georgiou. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	409 if (!PyUnicode_Check(item)) {
4127ab1f6338 Issue #10160: Speed up operator.attrgetter. Patch by Christos Georgiou. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	410 PyErr_SetString(PyExc_TypeError,
4127ab1f6338 Issue #10160: Speed up operator.attrgetter. Patch by Christos Georgiou. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	411 "attribute name must be a string");
4127ab1f6338 Issue #10160: Speed up operator.attrgetter. Patch by Christos Georgiou. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	412 Py_DECREF(attr);
4127ab1f6338 Issue #10160: Speed up operator.attrgetter. Patch by Christos Georgiou. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	413 return NULL;
4127ab1f6338 Issue #10160: Speed up operator.attrgetter. Patch by Christos Georgiou. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	414 }
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 65842 diff changeset	415 if (PyUnicode_READY(item)) {
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 65842 diff changeset	416 Py_DECREF(attr);
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 65842 diff changeset	417 return NULL;
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 65842 diff changeset	418 }
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 65842 diff changeset	419 item_len = PyUnicode_GET_LENGTH(item);
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 65842 diff changeset	420 kind = PyUnicode_KIND(item);
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 65842 diff changeset	421 data = PyUnicode_DATA(item);
65818 4127ab1f6338 Issue #10160: Speed up operator.attrgetter. Patch by Christos Georgiou. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	422
4127ab1f6338 Issue #10160: Speed up operator.attrgetter. Patch by Christos Georgiou. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	423 /* check whethere the string is dotted */
4127ab1f6338 Issue #10160: Speed up operator.attrgetter. Patch by Christos Georgiou. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	424 dot_count = 0;
4127ab1f6338 Issue #10160: Speed up operator.attrgetter. Patch by Christos Georgiou. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	425 for (char_idx = 0; char_idx < item_len; ++char_idx) {
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 65842 diff changeset	426 if (PyUnicode_READ(kind, data, char_idx) == '.')
65818 4127ab1f6338 Issue #10160: Speed up operator.attrgetter. Patch by Christos Georgiou. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	427 ++dot_count;
4127ab1f6338 Issue #10160: Speed up operator.attrgetter. Patch by Christos Georgiou. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	428 }
4127ab1f6338 Issue #10160: Speed up operator.attrgetter. Patch by Christos Georgiou. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	429
4127ab1f6338 Issue #10160: Speed up operator.attrgetter. Patch by Christos Georgiou. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	430 if (dot_count == 0) {
4127ab1f6338 Issue #10160: Speed up operator.attrgetter. Patch by Christos Georgiou. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	431 Py_INCREF(item);
4127ab1f6338 Issue #10160: Speed up operator.attrgetter. Patch by Christos Georgiou. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	432 PyUnicode_InternInPlace(&item);
4127ab1f6338 Issue #10160: Speed up operator.attrgetter. Patch by Christos Georgiou. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	433 PyTuple_SET_ITEM(attr, idx, item);
4127ab1f6338 Issue #10160: Speed up operator.attrgetter. Patch by Christos Georgiou. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	434 } else { /* make it a tuple of non-dotted attrnames */
4127ab1f6338 Issue #10160: Speed up operator.attrgetter. Patch by Christos Georgiou. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	435 PyObject *attr_chain = PyTuple_New(dot_count + 1);
4127ab1f6338 Issue #10160: Speed up operator.attrgetter. Patch by Christos Georgiou. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	436 PyObject *attr_chain_item;
65842 eaa50725122b No declarations in the middle of a block (fixes compile under Windows) Antoine Pitrou <solipsis@pitrou.net> parents: 65818 diff changeset	437 Py_ssize_t unibuff_from = 0;
eaa50725122b No declarations in the middle of a block (fixes compile under Windows) Antoine Pitrou <solipsis@pitrou.net> parents: 65818 diff changeset	438 Py_ssize_t unibuff_till = 0;
eaa50725122b No declarations in the middle of a block (fixes compile under Windows) Antoine Pitrou <solipsis@pitrou.net> parents: 65818 diff changeset	439 Py_ssize_t attr_chain_idx = 0;
65818 4127ab1f6338 Issue #10160: Speed up operator.attrgetter. Patch by Christos Georgiou. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	440
4127ab1f6338 Issue #10160: Speed up operator.attrgetter. Patch by Christos Georgiou. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	441 if (attr_chain == NULL) {
4127ab1f6338 Issue #10160: Speed up operator.attrgetter. Patch by Christos Georgiou. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	442 Py_DECREF(attr);
4127ab1f6338 Issue #10160: Speed up operator.attrgetter. Patch by Christos Georgiou. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	443 return NULL;
4127ab1f6338 Issue #10160: Speed up operator.attrgetter. Patch by Christos Georgiou. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	444 }
4127ab1f6338 Issue #10160: Speed up operator.attrgetter. Patch by Christos Georgiou. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	445
4127ab1f6338 Issue #10160: Speed up operator.attrgetter. Patch by Christos Georgiou. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	446 for (; dot_count > 0; --dot_count) {
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 65842 diff changeset	447 while (PyUnicode_READ(kind, data, unibuff_till) != '.') {
65818 4127ab1f6338 Issue #10160: Speed up operator.attrgetter. Patch by Christos Georgiou. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	448 ++unibuff_till;
4127ab1f6338 Issue #10160: Speed up operator.attrgetter. Patch by Christos Georgiou. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	449 }
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 65842 diff changeset	450 attr_chain_item = PyUnicode_Substring(item,
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 65842 diff changeset	451 unibuff_from,
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 65842 diff changeset	452 unibuff_till);
65818 4127ab1f6338 Issue #10160: Speed up operator.attrgetter. Patch by Christos Georgiou. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	453 if (attr_chain_item == NULL) {
4127ab1f6338 Issue #10160: Speed up operator.attrgetter. Patch by Christos Georgiou. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	454 Py_DECREF(attr_chain);
4127ab1f6338 Issue #10160: Speed up operator.attrgetter. Patch by Christos Georgiou. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	455 Py_DECREF(attr);
4127ab1f6338 Issue #10160: Speed up operator.attrgetter. Patch by Christos Georgiou. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	456 return NULL;
4127ab1f6338 Issue #10160: Speed up operator.attrgetter. Patch by Christos Georgiou. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	457 }
4127ab1f6338 Issue #10160: Speed up operator.attrgetter. Patch by Christos Georgiou. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	458 PyUnicode_InternInPlace(&attr_chain_item);
4127ab1f6338 Issue #10160: Speed up operator.attrgetter. Patch by Christos Georgiou. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	459 PyTuple_SET_ITEM(attr_chain, attr_chain_idx, attr_chain_item);
4127ab1f6338 Issue #10160: Speed up operator.attrgetter. Patch by Christos Georgiou. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	460 ++attr_chain_idx;
4127ab1f6338 Issue #10160: Speed up operator.attrgetter. Patch by Christos Georgiou. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	461 unibuff_till = unibuff_from = unibuff_till + 1;
4127ab1f6338 Issue #10160: Speed up operator.attrgetter. Patch by Christos Georgiou. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	462 }
4127ab1f6338 Issue #10160: Speed up operator.attrgetter. Patch by Christos Georgiou. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	463
4127ab1f6338 Issue #10160: Speed up operator.attrgetter. Patch by Christos Georgiou. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	464 /* now add the last dotless name */
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 65842 diff changeset	465 attr_chain_item = PyUnicode_Substring(item,
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 65842 diff changeset	466 unibuff_from, item_len);
65818 4127ab1f6338 Issue #10160: Speed up operator.attrgetter. Patch by Christos Georgiou. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	467 if (attr_chain_item == NULL) {
4127ab1f6338 Issue #10160: Speed up operator.attrgetter. Patch by Christos Georgiou. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	468 Py_DECREF(attr_chain);
4127ab1f6338 Issue #10160: Speed up operator.attrgetter. Patch by Christos Georgiou. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	469 Py_DECREF(attr);
4127ab1f6338 Issue #10160: Speed up operator.attrgetter. Patch by Christos Georgiou. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	470 return NULL;
4127ab1f6338 Issue #10160: Speed up operator.attrgetter. Patch by Christos Georgiou. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	471 }
4127ab1f6338 Issue #10160: Speed up operator.attrgetter. Patch by Christos Georgiou. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	472 PyUnicode_InternInPlace(&attr_chain_item);
4127ab1f6338 Issue #10160: Speed up operator.attrgetter. Patch by Christos Georgiou. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	473 PyTuple_SET_ITEM(attr_chain, attr_chain_idx, attr_chain_item);
4127ab1f6338 Issue #10160: Speed up operator.attrgetter. Patch by Christos Georgiou. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	474
4127ab1f6338 Issue #10160: Speed up operator.attrgetter. Patch by Christos Georgiou. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	475 PyTuple_SET_ITEM(attr, idx, attr_chain);
4127ab1f6338 Issue #10160: Speed up operator.attrgetter. Patch by Christos Georgiou. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	476 }
4127ab1f6338 Issue #10160: Speed up operator.attrgetter. Patch by Christos Georgiou. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	477 }
31052 456e274f8602 As discussed on python-dev, added two extractor functions to the Raymond Hettinger <python@rcn.com> parents: 27290 diff changeset	478
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	479 /* create attrgetterobject structure */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	480 ag = PyObject_GC_New(attrgetterobject, &attrgetter_type);
65818 4127ab1f6338 Issue #10160: Speed up operator.attrgetter. Patch by Christos Georgiou. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	481 if (ag == NULL) {
4127ab1f6338 Issue #10160: Speed up operator.attrgetter. Patch by Christos Georgiou. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	482 Py_DECREF(attr);
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	483 return NULL;
65818 4127ab1f6338 Issue #10160: Speed up operator.attrgetter. Patch by Christos Georgiou. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	484 }
31052 456e274f8602 As discussed on python-dev, added two extractor functions to the Raymond Hettinger <python@rcn.com> parents: 27290 diff changeset	485
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	486 ag->attr = attr;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	487 ag->nattrs = nattrs;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	488
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	489 PyObject_GC_Track(ag);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	490 return (PyObject *)ag;
31052 456e274f8602 As discussed on python-dev, added two extractor functions to the Raymond Hettinger <python@rcn.com> parents: 27290 diff changeset	491 }
456e274f8602 As discussed on python-dev, added two extractor functions to the Raymond Hettinger <python@rcn.com> parents: 27290 diff changeset	492
456e274f8602 As discussed on python-dev, added two extractor functions to the Raymond Hettinger <python@rcn.com> parents: 27290 diff changeset	493 static void
456e274f8602 As discussed on python-dev, added two extractor functions to the Raymond Hettinger <python@rcn.com> parents: 27290 diff changeset	494 attrgetter_dealloc(attrgetterobject *ag)
456e274f8602 As discussed on python-dev, added two extractor functions to the Raymond Hettinger <python@rcn.com> parents: 27290 diff changeset	495 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	496 PyObject_GC_UnTrack(ag);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	497 Py_XDECREF(ag->attr);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	498 PyObject_GC_Del(ag);
31052 456e274f8602 As discussed on python-dev, added two extractor functions to the Raymond Hettinger <python@rcn.com> parents: 27290 diff changeset	499 }
456e274f8602 As discussed on python-dev, added two extractor functions to the Raymond Hettinger <python@rcn.com> parents: 27290 diff changeset	500
456e274f8602 As discussed on python-dev, added two extractor functions to the Raymond Hettinger <python@rcn.com> parents: 27290 diff changeset	501 static int
456e274f8602 As discussed on python-dev, added two extractor functions to the Raymond Hettinger <python@rcn.com> parents: 27290 diff changeset	502 attrgetter_traverse(attrgetterobject ag, visitproc visit, void arg)
456e274f8602 As discussed on python-dev, added two extractor functions to the Raymond Hettinger <python@rcn.com> parents: 27290 diff changeset	503 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	504 Py_VISIT(ag->attr);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	505 return 0;
31052 456e274f8602 As discussed on python-dev, added two extractor functions to the Raymond Hettinger <python@rcn.com> parents: 27290 diff changeset	506 }
456e274f8602 As discussed on python-dev, added two extractor functions to the Raymond Hettinger <python@rcn.com> parents: 27290 diff changeset	507
456e274f8602 As discussed on python-dev, added two extractor functions to the Raymond Hettinger <python@rcn.com> parents: 27290 diff changeset	508 static PyObject *
45495 48488fa50729 Merged revisions 61003-61033 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	509 dotted_getattr(PyObject obj, PyObject attr)
48488fa50729 Merged revisions 61003-61033 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	510 {
65818 4127ab1f6338 Issue #10160: Speed up operator.attrgetter. Patch by Christos Georgiou. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	511 PyObject *newobj;
45495 48488fa50729 Merged revisions 61003-61033 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	512
65818 4127ab1f6338 Issue #10160: Speed up operator.attrgetter. Patch by Christos Georgiou. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	513 /* attr is either a tuple or instance of str.
4127ab1f6338 Issue #10160: Speed up operator.attrgetter. Patch by Christos Georgiou. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	514 Ensured by the setup code of attrgetter_new */
4127ab1f6338 Issue #10160: Speed up operator.attrgetter. Patch by Christos Georgiou. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	515 if (PyTuple_CheckExact(attr)) { /* chained getattr */
4127ab1f6338 Issue #10160: Speed up operator.attrgetter. Patch by Christos Georgiou. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	516 Py_ssize_t name_idx = 0, name_count;
4127ab1f6338 Issue #10160: Speed up operator.attrgetter. Patch by Christos Georgiou. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	517 PyObject *attr_name;
45495 48488fa50729 Merged revisions 61003-61033 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	518
65818 4127ab1f6338 Issue #10160: Speed up operator.attrgetter. Patch by Christos Georgiou. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	519 name_count = PyTuple_GET_SIZE(attr);
4127ab1f6338 Issue #10160: Speed up operator.attrgetter. Patch by Christos Georgiou. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	520 Py_INCREF(obj);
4127ab1f6338 Issue #10160: Speed up operator.attrgetter. Patch by Christos Georgiou. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	521 for (name_idx = 0; name_idx < name_count; ++name_idx) {
4127ab1f6338 Issue #10160: Speed up operator.attrgetter. Patch by Christos Georgiou. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	522 attr_name = PyTuple_GET_ITEM(attr, name_idx);
4127ab1f6338 Issue #10160: Speed up operator.attrgetter. Patch by Christos Georgiou. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	523 newobj = PyObject_GetAttr(obj, attr_name);
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	524 Py_DECREF(obj);
65818 4127ab1f6338 Issue #10160: Speed up operator.attrgetter. Patch by Christos Georgiou. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	525 if (newobj == NULL) {
4127ab1f6338 Issue #10160: Speed up operator.attrgetter. Patch by Christos Georgiou. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	526 return NULL;
4127ab1f6338 Issue #10160: Speed up operator.attrgetter. Patch by Christos Georgiou. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	527 }
4127ab1f6338 Issue #10160: Speed up operator.attrgetter. Patch by Christos Georgiou. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	528 /* here */
4127ab1f6338 Issue #10160: Speed up operator.attrgetter. Patch by Christos Georgiou. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	529 obj = newobj;
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	530 }
65818 4127ab1f6338 Issue #10160: Speed up operator.attrgetter. Patch by Christos Georgiou. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	531 } else { /* single getattr */
4127ab1f6338 Issue #10160: Speed up operator.attrgetter. Patch by Christos Georgiou. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	532 newobj = PyObject_GetAttr(obj, attr);
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	533 if (newobj == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	534 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	535 obj = newobj;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	536 }
45495 48488fa50729 Merged revisions 61003-61033 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	537
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	538 return obj;
45495 48488fa50729 Merged revisions 61003-61033 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	539 }
48488fa50729 Merged revisions 61003-61033 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	540
48488fa50729 Merged revisions 61003-61033 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	541 static PyObject *
31052 456e274f8602 As discussed on python-dev, added two extractor functions to the Raymond Hettinger <python@rcn.com> parents: 27290 diff changeset	542 attrgetter_call(attrgetterobject ag, PyObject args, PyObject *kw)
456e274f8602 As discussed on python-dev, added two extractor functions to the Raymond Hettinger <python@rcn.com> parents: 27290 diff changeset	543 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	544 PyObject obj, result;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	545 Py_ssize_t i, nattrs=ag->nattrs;
31052 456e274f8602 As discussed on python-dev, added two extractor functions to the Raymond Hettinger <python@rcn.com> parents: 27290 diff changeset	546
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	547 if (!PyArg_UnpackTuple(args, "attrgetter", 1, 1, &obj))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	548 return NULL;
65818 4127ab1f6338 Issue #10160: Speed up operator.attrgetter. Patch by Christos Georgiou. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	549 if (ag->nattrs == 1) /* ag->attr is always a tuple */
4127ab1f6338 Issue #10160: Speed up operator.attrgetter. Patch by Christos Georgiou. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	550 return dotted_getattr(obj, PyTuple_GET_ITEM(ag->attr, 0));
34716 ddc2276c247e operator.itemgetter() and operator.attrgetter() now support extraction Raymond Hettinger <python@rcn.com> parents: 31110 diff changeset	551
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	552 assert(PyTuple_Check(ag->attr));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	553 assert(PyTuple_GET_SIZE(ag->attr) == nattrs);
34716 ddc2276c247e operator.itemgetter() and operator.attrgetter() now support extraction Raymond Hettinger <python@rcn.com> parents: 31110 diff changeset	554
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	555 result = PyTuple_New(nattrs);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	556 if (result == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	557 return NULL;
34716 ddc2276c247e operator.itemgetter() and operator.attrgetter() now support extraction Raymond Hettinger <python@rcn.com> parents: 31110 diff changeset	558
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	559 for (i=0 ; i < nattrs ; i++) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	560 PyObject attr, val;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	561 attr = PyTuple_GET_ITEM(ag->attr, i);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	562 val = dotted_getattr(obj, attr);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	563 if (val == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	564 Py_DECREF(result);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	565 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	566 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	567 PyTuple_SET_ITEM(result, i, val);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	568 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	569 return result;
31052 456e274f8602 As discussed on python-dev, added two extractor functions to the Raymond Hettinger <python@rcn.com> parents: 27290 diff changeset	570 }
456e274f8602 As discussed on python-dev, added two extractor functions to the Raymond Hettinger <python@rcn.com> parents: 27290 diff changeset	571
456e274f8602 As discussed on python-dev, added two extractor functions to the Raymond Hettinger <python@rcn.com> parents: 27290 diff changeset	572 PyDoc_STRVAR(attrgetter_doc,
34716 ddc2276c247e operator.itemgetter() and operator.attrgetter() now support extraction Raymond Hettinger <python@rcn.com> parents: 31110 diff changeset	573 "attrgetter(attr, ...) --> attrgetter object\n\
31052 456e274f8602 As discussed on python-dev, added two extractor functions to the Raymond Hettinger <python@rcn.com> parents: 27290 diff changeset	574 \n\
34716 ddc2276c247e operator.itemgetter() and operator.attrgetter() now support extraction Raymond Hettinger <python@rcn.com> parents: 31110 diff changeset	575 Return a callable object that fetches the given attribute(s) from its operand.\n\
ddc2276c247e operator.itemgetter() and operator.attrgetter() now support extraction Raymond Hettinger <python@rcn.com> parents: 31110 diff changeset	576 After, f=attrgetter('name'), the call f(r) returns r.name.\n\
45495 48488fa50729 Merged revisions 61003-61033 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	577 After, g=attrgetter('name', 'date'), the call g(r) returns (r.name, r.date).\n\
48488fa50729 Merged revisions 61003-61033 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	578 After, h=attrgetter('name.first', 'name.last'), the call h(r) returns\n\
48488fa50729 Merged revisions 61003-61033 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	579 (r.name.first, r.name.last).");
31052 456e274f8602 As discussed on python-dev, added two extractor functions to the Raymond Hettinger <python@rcn.com> parents: 27290 diff changeset	580
456e274f8602 As discussed on python-dev, added two extractor functions to the Raymond Hettinger <python@rcn.com> parents: 27290 diff changeset	581 static PyTypeObject attrgetter_type = {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	582 PyVarObject_HEAD_INIT(NULL, 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	583 "operator.attrgetter", /* tp_name */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	584 sizeof(attrgetterobject), /* tp_basicsize */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	585 0, /* tp_itemsize */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	586 /* methods */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	587 (destructor)attrgetter_dealloc, /* tp_dealloc */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	588 0, /* tp_print */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	589 0, /* tp_getattr */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	590 0, /* tp_setattr */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	591 0, /* tp_reserved */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	592 0, /* tp_repr */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	593 0, /* tp_as_number */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	594 0, /* tp_as_sequence */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	595 0, /* tp_as_mapping */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	596 0, /* tp_hash */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	597 (ternaryfunc)attrgetter_call, /* tp_call */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	598 0, /* tp_str */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	599 PyObject_GenericGetAttr, /* tp_getattro */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	600 0, /* tp_setattro */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	601 0, /* tp_as_buffer */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	602 Py_TPFLAGS_DEFAULT \| Py_TPFLAGS_HAVE_GC, /* tp_flags */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	603 attrgetter_doc, /* tp_doc */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	604 (traverseproc)attrgetter_traverse, /* tp_traverse */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	605 0, /* tp_clear */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	606 0, /* tp_richcompare */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	607 0, /* tp_weaklistoffset */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	608 0, /* tp_iter */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	609 0, /* tp_iternext */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	610 0, /* tp_methods */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	611 0, /* tp_members */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	612 0, /* tp_getset */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	613 0, /* tp_base */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	614 0, /* tp_dict */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	615 0, /* tp_descr_get */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	616 0, /* tp_descr_set */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	617 0, /* tp_dictoffset */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	618 0, /* tp_init */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	619 0, /* tp_alloc */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	620 attrgetter_new, /* tp_new */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	621 0, /* tp_free */
31052 456e274f8602 As discussed on python-dev, added two extractor functions to the Raymond Hettinger <python@rcn.com> parents: 27290 diff changeset	622 };
45495 48488fa50729 Merged revisions 61003-61033 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	623
48488fa50729 Merged revisions 61003-61033 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	624
48488fa50729 Merged revisions 61003-61033 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	625 /* methodcaller object **********************************************************/
48488fa50729 Merged revisions 61003-61033 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	626
48488fa50729 Merged revisions 61003-61033 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	627 typedef struct {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	628 PyObject_HEAD
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	629 PyObject *name;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	630 PyObject *args;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	631 PyObject *kwds;
45495 48488fa50729 Merged revisions 61003-61033 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	632 } methodcallerobject;
48488fa50729 Merged revisions 61003-61033 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	633
48488fa50729 Merged revisions 61003-61033 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	634 static PyTypeObject methodcaller_type;
48488fa50729 Merged revisions 61003-61033 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	635
48488fa50729 Merged revisions 61003-61033 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	636 static PyObject *
48488fa50729 Merged revisions 61003-61033 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	637 methodcaller_new(PyTypeObject type, PyObject args, PyObject *kwds)
48488fa50729 Merged revisions 61003-61033 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	638 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	639 methodcallerobject *mc;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	640 PyObject name, newargs;
45495 48488fa50729 Merged revisions 61003-61033 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	641
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	642 if (PyTuple_GET_SIZE(args) < 1) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	643 PyErr_SetString(PyExc_TypeError, "methodcaller needs at least "
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	644 "one argument, the method name");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	645 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	646 }
45495 48488fa50729 Merged revisions 61003-61033 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	647
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	648 /* create methodcallerobject structure */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	649 mc = PyObject_GC_New(methodcallerobject, &methodcaller_type);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	650 if (mc == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	651 return NULL;
45495 48488fa50729 Merged revisions 61003-61033 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	652
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	653 newargs = PyTuple_GetSlice(args, 1, PyTuple_GET_SIZE(args));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	654 if (newargs == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	655 Py_DECREF(mc);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	656 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	657 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	658 mc->args = newargs;
45495 48488fa50729 Merged revisions 61003-61033 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	659
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	660 name = PyTuple_GET_ITEM(args, 0);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	661 Py_INCREF(name);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	662 mc->name = name;
45495 48488fa50729 Merged revisions 61003-61033 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	663
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	664 Py_XINCREF(kwds);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	665 mc->kwds = kwds;
45495 48488fa50729 Merged revisions 61003-61033 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	666
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	667 PyObject_GC_Track(mc);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	668 return (PyObject *)mc;
45495 48488fa50729 Merged revisions 61003-61033 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	669 }
48488fa50729 Merged revisions 61003-61033 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	670
48488fa50729 Merged revisions 61003-61033 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	671 static void
48488fa50729 Merged revisions 61003-61033 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	672 methodcaller_dealloc(methodcallerobject *mc)
48488fa50729 Merged revisions 61003-61033 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	673 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	674 PyObject_GC_UnTrack(mc);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	675 Py_XDECREF(mc->name);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	676 Py_XDECREF(mc->args);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	677 Py_XDECREF(mc->kwds);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	678 PyObject_GC_Del(mc);
45495 48488fa50729 Merged revisions 61003-61033 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	679 }
48488fa50729 Merged revisions 61003-61033 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	680
48488fa50729 Merged revisions 61003-61033 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	681 static int
48488fa50729 Merged revisions 61003-61033 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	682 methodcaller_traverse(methodcallerobject mc, visitproc visit, void arg)
48488fa50729 Merged revisions 61003-61033 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	683 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	684 Py_VISIT(mc->args);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	685 Py_VISIT(mc->kwds);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	686 return 0;
45495 48488fa50729 Merged revisions 61003-61033 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	687 }
48488fa50729 Merged revisions 61003-61033 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	688
48488fa50729 Merged revisions 61003-61033 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	689 static PyObject *
48488fa50729 Merged revisions 61003-61033 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	690 methodcaller_call(methodcallerobject mc, PyObject args, PyObject *kw)
48488fa50729 Merged revisions 61003-61033 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	691 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	692 PyObject method, obj, *result;
45495 48488fa50729 Merged revisions 61003-61033 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	693
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	694 if (!PyArg_UnpackTuple(args, "methodcaller", 1, 1, &obj))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	695 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	696 method = PyObject_GetAttr(obj, mc->name);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	697 if (method == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	698 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	699 result = PyObject_Call(method, mc->args, mc->kwds);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	700 Py_DECREF(method);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	701 return result;
45495 48488fa50729 Merged revisions 61003-61033 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	702 }
48488fa50729 Merged revisions 61003-61033 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	703
48488fa50729 Merged revisions 61003-61033 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	704 PyDoc_STRVAR(methodcaller_doc,
48488fa50729 Merged revisions 61003-61033 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	705 "methodcaller(name, ...) --> methodcaller object\n\
48488fa50729 Merged revisions 61003-61033 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	706 \n\
48488fa50729 Merged revisions 61003-61033 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	707 Return a callable object that calls the given method on its operand.\n\
48488fa50729 Merged revisions 61003-61033 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	708 After, f = methodcaller('name'), the call f(r) returns r.name().\n\
48488fa50729 Merged revisions 61003-61033 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	709 After, g = methodcaller('name', 'date', foo=1), the call g(r) returns\n\
48488fa50729 Merged revisions 61003-61033 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	710 r.name('date', foo=1).");
48488fa50729 Merged revisions 61003-61033 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	711
48488fa50729 Merged revisions 61003-61033 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	712 static PyTypeObject methodcaller_type = {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	713 PyVarObject_HEAD_INIT(NULL, 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	714 "operator.methodcaller", /* tp_name */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	715 sizeof(methodcallerobject), /* tp_basicsize */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	716 0, /* tp_itemsize */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	717 /* methods */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	718 (destructor)methodcaller_dealloc, /* tp_dealloc */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	719 0, /* tp_print */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	720 0, /* tp_getattr */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	721 0, /* tp_setattr */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	722 0, /* tp_reserved */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	723 0, /* tp_repr */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	724 0, /* tp_as_number */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	725 0, /* tp_as_sequence */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	726 0, /* tp_as_mapping */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	727 0, /* tp_hash */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	728 (ternaryfunc)methodcaller_call, /* tp_call */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	729 0, /* tp_str */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	730 PyObject_GenericGetAttr, /* tp_getattro */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	731 0, /* tp_setattro */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	732 0, /* tp_as_buffer */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	733 Py_TPFLAGS_DEFAULT \| Py_TPFLAGS_HAVE_GC,/* tp_flags */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	734 methodcaller_doc, /* tp_doc */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	735 (traverseproc)methodcaller_traverse, /* tp_traverse */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	736 0, /* tp_clear */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	737 0, /* tp_richcompare */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	738 0, /* tp_weaklistoffset */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	739 0, /* tp_iter */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	740 0, /* tp_iternext */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	741 0, /* tp_methods */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	742 0, /* tp_members */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	743 0, /* tp_getset */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	744 0, /* tp_base */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	745 0, /* tp_dict */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	746 0, /* tp_descr_get */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	747 0, /* tp_descr_set */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	748 0, /* tp_dictoffset */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	749 0, /* tp_init */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	750 0, /* tp_alloc */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	751 methodcaller_new, /* tp_new */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	752 0, /* tp_free */
45495 48488fa50729 Merged revisions 61003-61033 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	753 };
48488fa50729 Merged revisions 61003-61033 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	754
48488fa50729 Merged revisions 61003-61033 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	755
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 45795 diff changeset	756 /* Initialization function for the module (must be called PyInit_operator) */
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 45795 diff changeset	757
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 45795 diff changeset	758
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 45795 diff changeset	759 static struct PyModuleDef operatormodule = {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	760 PyModuleDef_HEAD_INIT,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	761 "operator",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	762 operator_doc,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	763 -1,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	764 operator_methods,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	765 NULL,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	766 NULL,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	767 NULL,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	768 NULL
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 45795 diff changeset	769 };
3844 0d54a14ef0b8 Operators like __add__ Guido van Rossum <guido@python.org> parents: diff changeset	770
24471 f66b3a3509c7 Excise DL_EXPORT/DL_IMPORT from Modules/. Required adding a prototype Mark Hammond <mhammond@skippinet.com.au>* parents: 23832 diff changeset	771 PyMODINIT_FUNC
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 45795 diff changeset	772 PyInit_operator(void)
3844 0d54a14ef0b8 Operators like __add__ Guido van Rossum <guido@python.org> parents: diff changeset	773 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	774 PyObject *m;
31052 456e274f8602 As discussed on python-dev, added two extractor functions to the Raymond Hettinger <python@rcn.com> parents: 27290 diff changeset	775
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	776 /* Create the module and add the functions */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	777 m = PyModule_Create(&operatormodule);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	778 if (m == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	779 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	780
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	781 if (PyType_Ready(&itemgetter_type) < 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	782 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	783 Py_INCREF(&itemgetter_type);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	784 PyModule_AddObject(m, "itemgetter", (PyObject *)&itemgetter_type);
31052 456e274f8602 As discussed on python-dev, added two extractor functions to the Raymond Hettinger <python@rcn.com> parents: 27290 diff changeset	785
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	786 if (PyType_Ready(&attrgetter_type) < 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	787 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	788 Py_INCREF(&attrgetter_type);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	789 PyModule_AddObject(m, "attrgetter", (PyObject *)&attrgetter_type);
45495 48488fa50729 Merged revisions 61003-61033 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	790
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	791 if (PyType_Ready(&methodcaller_type) < 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	792 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	793 Py_INCREF(&methodcaller_type);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	794 PyModule_AddObject(m, "methodcaller", (PyObject *)&methodcaller_type);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57210 diff changeset	795 return m;
3844 0d54a14ef0b8 Operators like __add__ Guido van Rossum <guido@python.org> parents: diff changeset	796 }

Mercurial > cpython-lru_cache-weakref

annotate Modules/operator.c @ 74006:88198b93ff2f