cpython-lru_cache-weakref: Objects/abstract.c annotate

annotate Objects/abstract.c @ 78069:a8aa77458e12 3.2

Add c_size_t and c_ssize_t to the ctypes summary table.

author	Antoine Pitrou <solipsis@pitrou.net>
date	Thu, 12 Jul 2012 20:31:50 +0200
parents	3c9232a684ae
children	cfddcf964ff0 d3ae3fe3eb97

rev	line source
2840 d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	1 /* Abstract Object Interface (many thanks to Jim Fulton) */
8400 6270c6bad811 Completely reformatted, standardizing indentation as well as Guido van Rossum <guido@python.org> parents: 7854 diff changeset	2
2840 d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	3 #include "Python.h"
8412 4505160a7e5c Address some gcc -Wall warnings (e.g. include <ctype.h>). Guido van Rossum <guido@python.org> parents: 8400 diff changeset	4 #include <ctype.h>
15721 ead8b5b994ad Massive changes as per PEP 208. Read it for details. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15029 diff changeset	5 #include "structmember.h" /* we need the offsetof() macro from there */
19837 5158e4789459 SF bug #460020: bug or feature: unicode() and subclasses. Tim Peters <tim.peters@gmail.com> parents: 19808 diff changeset	6 #include "longintrepr.h"
15721 ead8b5b994ad Massive changes as per PEP 208. Read it for details. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15029 diff changeset	7
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	8
39610 3674f20ac781 Merge current trunk into p3yk. This includes the PyNumber_Index API change, Thomas Wouters <thomas@python.org> parents: 39603 diff changeset	9
8400 6270c6bad811 Completely reformatted, standardizing indentation as well as Guido van Rossum <guido@python.org> parents: 7854 diff changeset	10 /* Shorthands to return certain errors */
6270c6bad811 Completely reformatted, standardizing indentation as well as Guido van Rossum <guido@python.org> parents: 7854 diff changeset	11
6270c6bad811 Completely reformatted, standardizing indentation as well as Guido van Rossum <guido@python.org> parents: 7854 diff changeset	12 static PyObject *
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	13 type_error(const char msg, PyObject obj)
8400 6270c6bad811 Completely reformatted, standardizing indentation as well as Guido van Rossum <guido@python.org> parents: 7854 diff changeset	14 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	15 PyErr_Format(PyExc_TypeError, msg, obj->ob_type->tp_name);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	16 return NULL;
8400 6270c6bad811 Completely reformatted, standardizing indentation as well as Guido van Rossum <guido@python.org> parents: 7854 diff changeset	17 }
6270c6bad811 Completely reformatted, standardizing indentation as well as Guido van Rossum <guido@python.org> parents: 7854 diff changeset	18
6270c6bad811 Completely reformatted, standardizing indentation as well as Guido van Rossum <guido@python.org> parents: 7854 diff changeset	19 static PyObject *
13449 0409a98cd582 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	20 null_error(void)
8400 6270c6bad811 Completely reformatted, standardizing indentation as well as Guido van Rossum <guido@python.org> parents: 7854 diff changeset	21 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	22 if (!PyErr_Occurred())
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	23 PyErr_SetString(PyExc_SystemError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	24 "null argument to internal routine");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	25 return NULL;
8400 6270c6bad811 Completely reformatted, standardizing indentation as well as Guido van Rossum <guido@python.org> parents: 7854 diff changeset	26 }
6270c6bad811 Completely reformatted, standardizing indentation as well as Guido van Rossum <guido@python.org> parents: 7854 diff changeset	27
6270c6bad811 Completely reformatted, standardizing indentation as well as Guido van Rossum <guido@python.org> parents: 7854 diff changeset	28 /* Operations on any object */
6270c6bad811 Completely reformatted, standardizing indentation as well as Guido van Rossum <guido@python.org> parents: 7854 diff changeset	29
2840 d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	30 PyObject *
13449 0409a98cd582 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	31 PyObject_Type(PyObject *o)
2840 d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	32 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	33 PyObject *v;
2840 d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	34
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	35 if (o == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	36 return null_error();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	37 v = (PyObject *)o->ob_type;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	38 Py_INCREF(v);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	39 return v;
2840 d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	40 }
d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	41
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36484 diff changeset	42 Py_ssize_t
13575 7c119f050290 change abstract size functions PySequence_Size &c. Jeremy Hylton <jeremy@alum.mit.edu> parents: 13451 diff changeset	43 PyObject_Size(PyObject *o)
2840 d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	44 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	45 PySequenceMethods *m;
2840 d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	46
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	47 if (o == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	48 null_error();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	49 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	50 }
2840 d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	51
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	52 m = o->ob_type->tp_as_sequence;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	53 if (m && m->sq_length)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	54 return m->sq_length(o);
2840 d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	55
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	56 return PyMapping_Size(o);
2840 d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	57 }
d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	58
13634 6f0d96e6b5a5 Restore PyXXX_Length() APIs for binary compatibility. Marc-André Lemburg <mal@egenix.com> parents: 13575 diff changeset	59 #undef PyObject_Length
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36484 diff changeset	60 Py_ssize_t
13634 6f0d96e6b5a5 Restore PyXXX_Length() APIs for binary compatibility. Marc-André Lemburg <mal@egenix.com> parents: 13575 diff changeset	61 PyObject_Length(PyObject *o)
6f0d96e6b5a5 Restore PyXXX_Length() APIs for binary compatibility. Marc-André Lemburg <mal@egenix.com> parents: 13575 diff changeset	62 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	63 return PyObject_Size(o);
13634 6f0d96e6b5a5 Restore PyXXX_Length() APIs for binary compatibility. Marc-André Lemburg <mal@egenix.com> parents: 13575 diff changeset	64 }
6f0d96e6b5a5 Restore PyXXX_Length() APIs for binary compatibility. Marc-André Lemburg <mal@egenix.com> parents: 13575 diff changeset	65 #define PyObject_Length PyObject_Size
6f0d96e6b5a5 Restore PyXXX_Length() APIs for binary compatibility. Marc-André Lemburg <mal@egenix.com> parents: 13575 diff changeset	66
44226 aad65a2424e3 Merged revisions 59376-59406 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44139 diff changeset	67
aad65a2424e3 Merged revisions 59376-59406 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44139 diff changeset	68 /* The length hint function returns a non-negative value from o.__len__()
aad65a2424e3 Merged revisions 59376-59406 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44139 diff changeset	69 or o.__length_hint__(). If those methods aren't found or return a negative
51283 6251b9d321af Issue 1242657: list(obj) can swallow KeyboardInterrupt. Raymond Hettinger <python@rcn.com> parents: 51245 diff changeset	70 value, then the defaultvalue is returned. If one of the calls fails,
6251b9d321af Issue 1242657: list(obj) can swallow KeyboardInterrupt. Raymond Hettinger <python@rcn.com> parents: 51245 diff changeset	71 this function returns -1.
44226 aad65a2424e3 Merged revisions 59376-59406 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44139 diff changeset	72 */
aad65a2424e3 Merged revisions 59376-59406 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44139 diff changeset	73
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36484 diff changeset	74 Py_ssize_t
44226 aad65a2424e3 Merged revisions 59376-59406 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44139 diff changeset	75 _PyObject_LengthHint(PyObject *o, Py_ssize_t defaultvalue)
35636 e22334b1da67 Convert iterator __len__() methods to a private API. Raymond Hettinger <python@rcn.com> parents: 35364 diff changeset	76 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	77 static PyObject *hintstrobj = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	78 PyObject ro, hintmeth;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	79 Py_ssize_t rv;
44226 aad65a2424e3 Merged revisions 59376-59406 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44139 diff changeset	80
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	81 /* try o.__len__() */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	82 rv = PyObject_Size(o);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	83 if (rv >= 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	84 return rv;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	85 if (PyErr_Occurred()) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	86 if (!PyErr_ExceptionMatches(PyExc_TypeError))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	87 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	88 PyErr_Clear();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	89 }
35636 e22334b1da67 Convert iterator __len__() methods to a private API. Raymond Hettinger <python@rcn.com> parents: 35364 diff changeset	90
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	91 /* try o.__length_hint__() */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	92 hintmeth = _PyObject_LookupSpecial(o, "__length_hint__", &hintstrobj);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	93 if (hintmeth == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	94 if (PyErr_Occurred())
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	95 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	96 else
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	97 return defaultvalue;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	98 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	99 ro = PyObject_CallFunctionObjArgs(hintmeth, NULL);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	100 Py_DECREF(hintmeth);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	101 if (ro == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	102 if (!PyErr_ExceptionMatches(PyExc_TypeError))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	103 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	104 PyErr_Clear();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	105 return defaultvalue;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	106 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	107 rv = PyLong_Check(ro) ? PyLong_AsSsize_t(ro) : defaultvalue;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	108 Py_DECREF(ro);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	109 return rv;
35636 e22334b1da67 Convert iterator __len__() methods to a private API. Raymond Hettinger <python@rcn.com> parents: 35364 diff changeset	110 }
e22334b1da67 Convert iterator __len__() methods to a private API. Raymond Hettinger <python@rcn.com> parents: 35364 diff changeset	111
2840 d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	112 PyObject *
13449 0409a98cd582 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	113 PyObject_GetItem(PyObject o, PyObject key)
2840 d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	114 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	115 PyMappingMethods *m;
2840 d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	116
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	117 if (o == NULL \|\| key == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	118 return null_error();
2840 d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	119
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	120 m = o->ob_type->tp_as_mapping;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	121 if (m && m->mp_subscript)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	122 return m->mp_subscript(o, key);
2840 d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	123
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	124 if (o->ob_type->tp_as_sequence) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	125 if (PyIndex_Check(key)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	126 Py_ssize_t key_value;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	127 key_value = PyNumber_AsSsize_t(key, PyExc_IndexError);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	128 if (key_value == -1 && PyErr_Occurred())
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	129 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	130 return PySequence_GetItem(o, key_value);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	131 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	132 else if (o->ob_type->tp_as_sequence->sq_item)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	133 return type_error("sequence index must "
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	134 "be integer, not '%.200s'", key);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	135 }
8400 6270c6bad811 Completely reformatted, standardizing indentation as well as Guido van Rossum <guido@python.org> parents: 7854 diff changeset	136
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	137 return type_error("'%.200s' object is not subscriptable", o);
2840 d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	138 }
d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	139
d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	140 int
13449 0409a98cd582 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	141 PyObject_SetItem(PyObject o, PyObject key, PyObject *value)
2840 d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	142 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	143 PyMappingMethods *m;
2840 d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	144
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	145 if (o == NULL \|\| key == NULL \|\| value == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	146 null_error();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	147 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	148 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	149 m = o->ob_type->tp_as_mapping;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	150 if (m && m->mp_ass_subscript)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	151 return m->mp_ass_subscript(o, key, value);
2840 d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	152
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	153 if (o->ob_type->tp_as_sequence) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	154 if (PyIndex_Check(key)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	155 Py_ssize_t key_value;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	156 key_value = PyNumber_AsSsize_t(key, PyExc_IndexError);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	157 if (key_value == -1 && PyErr_Occurred())
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	158 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	159 return PySequence_SetItem(o, key_value, value);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	160 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	161 else if (o->ob_type->tp_as_sequence->sq_ass_item) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	162 type_error("sequence index must be "
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	163 "integer, not '%.200s'", key);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	164 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	165 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	166 }
8400 6270c6bad811 Completely reformatted, standardizing indentation as well as Guido van Rossum <guido@python.org> parents: 7854 diff changeset	167
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	168 type_error("'%.200s' object does not support item assignment", o);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	169 return -1;
2840 d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	170 }
d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	171
4090 0b40c8d5b21d Added PyObject_DelItem and PySequence_Del{Item,Slice}. Guido van Rossum <guido@python.org> parents: 3097 diff changeset	172 int
13449 0409a98cd582 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	173 PyObject_DelItem(PyObject o, PyObject key)
4090 0b40c8d5b21d Added PyObject_DelItem and PySequence_Del{Item,Slice}. Guido van Rossum <guido@python.org> parents: 3097 diff changeset	174 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	175 PyMappingMethods *m;
4090 0b40c8d5b21d Added PyObject_DelItem and PySequence_Del{Item,Slice}. Guido van Rossum <guido@python.org> parents: 3097 diff changeset	176
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	177 if (o == NULL \|\| key == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	178 null_error();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	179 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	180 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	181 m = o->ob_type->tp_as_mapping;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	182 if (m && m->mp_ass_subscript)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	183 return m->mp_ass_subscript(o, key, (PyObject*)NULL);
4090 0b40c8d5b21d Added PyObject_DelItem and PySequence_Del{Item,Slice}. Guido van Rossum <guido@python.org> parents: 3097 diff changeset	184
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	185 if (o->ob_type->tp_as_sequence) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	186 if (PyIndex_Check(key)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	187 Py_ssize_t key_value;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	188 key_value = PyNumber_AsSsize_t(key, PyExc_IndexError);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	189 if (key_value == -1 && PyErr_Occurred())
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	190 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	191 return PySequence_DelItem(o, key_value);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	192 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	193 else if (o->ob_type->tp_as_sequence->sq_ass_item) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	194 type_error("sequence index must be "
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	195 "integer, not '%.200s'", key);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	196 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	197 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	198 }
8400 6270c6bad811 Completely reformatted, standardizing indentation as well as Guido van Rossum <guido@python.org> parents: 7854 diff changeset	199
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	200 type_error("'%.200s' object does not support item deletion", o);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	201 return -1;
4090 0b40c8d5b21d Added PyObject_DelItem and PySequence_Del{Item,Slice}. Guido van Rossum <guido@python.org> parents: 3097 diff changeset	202 }
0b40c8d5b21d Added PyObject_DelItem and PySequence_Del{Item,Slice}. Guido van Rossum <guido@python.org> parents: 3097 diff changeset	203
21644 3c0bd2f37a78 Implement PyObject_DelItemString. Fixes #498915. Martin v. Löwis <martin@v.loewis.de> parents: 21044 diff changeset	204 int
3c0bd2f37a78 Implement PyObject_DelItemString. Fixes #498915. Martin v. Löwis <martin@v.loewis.de> parents: 21044 diff changeset	205 PyObject_DelItemString(PyObject o, char key)
3c0bd2f37a78 Implement PyObject_DelItemString. Fixes #498915. Martin v. Löwis <martin@v.loewis.de> parents: 21044 diff changeset	206 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	207 PyObject *okey;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	208 int ret;
21644 3c0bd2f37a78 Implement PyObject_DelItemString. Fixes #498915. Martin v. Löwis <martin@v.loewis.de> parents: 21044 diff changeset	209
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	210 if (o == NULL \|\| key == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	211 null_error();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	212 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	213 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	214 okey = PyUnicode_FromString(key);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	215 if (okey == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	216 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	217 ret = PyObject_DelItem(o, okey);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	218 Py_DECREF(okey);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	219 return ret;
21644 3c0bd2f37a78 Implement PyObject_DelItemString. Fixes #498915. Martin v. Löwis <martin@v.loewis.de> parents: 21044 diff changeset	220 }
3c0bd2f37a78 Implement PyObject_DelItemString. Fixes #498915. Martin v. Löwis <martin@v.loewis.de> parents: 21044 diff changeset	221
42665 85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: 42084 diff changeset	222 /* We release the buffer right after use of this function which could
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43555 diff changeset	223 cause issues later on. Don't use these functions in new code.
42665 85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: 42084 diff changeset	224 */
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	225 int
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	226 PyObject_AsCharBuffer(PyObject *obj,
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	227 const char **buffer,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	228 Py_ssize_t *buffer_len)
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11943 diff changeset	229 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	230 PyBufferProcs *pb;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	231 Py_buffer view;
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11943 diff changeset	232
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	233 if (obj == NULL \|\| buffer == NULL \|\| buffer_len == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	234 null_error();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	235 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	236 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	237 pb = obj->ob_type->tp_as_buffer;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	238 if (pb == NULL \|\| pb->bf_getbuffer == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	239 PyErr_SetString(PyExc_TypeError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	240 "expected an object with the buffer interface");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	241 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	242 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	243 if ((*pb->bf_getbuffer)(obj, &view, PyBUF_SIMPLE)) return -1;
42665 85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: 42084 diff changeset	244
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	245 *buffer = view.buf;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	246 *buffer_len = view.len;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	247 if (pb->bf_releasebuffer != NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	248 (*pb->bf_releasebuffer)(obj, &view);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	249 Py_XDECREF(view.obj);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	250 return 0;
20946 ef12c9ddefa7 Add PyObject_CheckReadBuffer(), which returns true if its argument Jeremy Hylton <jeremy@alum.mit.edu> parents: 20824 diff changeset	251 }
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11943 diff changeset	252
20946 ef12c9ddefa7 Add PyObject_CheckReadBuffer(), which returns true if its argument Jeremy Hylton <jeremy@alum.mit.edu> parents: 20824 diff changeset	253 int
ef12c9ddefa7 Add PyObject_CheckReadBuffer(), which returns true if its argument Jeremy Hylton <jeremy@alum.mit.edu> parents: 20824 diff changeset	254 PyObject_CheckReadBuffer(PyObject *obj)
ef12c9ddefa7 Add PyObject_CheckReadBuffer(), which returns true if its argument Jeremy Hylton <jeremy@alum.mit.edu> parents: 20824 diff changeset	255 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	256 PyBufferProcs *pb = obj->ob_type->tp_as_buffer;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	257 Py_buffer view;
20946 ef12c9ddefa7 Add PyObject_CheckReadBuffer(), which returns true if its argument Jeremy Hylton <jeremy@alum.mit.edu> parents: 20824 diff changeset	258
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	259 if (pb == NULL \|\|
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	260 pb->bf_getbuffer == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	261 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	262 if ((*pb->bf_getbuffer)(obj, &view, PyBUF_SIMPLE) == -1) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	263 PyErr_Clear();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	264 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	265 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	266 PyBuffer_Release(&view);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	267 return 1;
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11943 diff changeset	268 }
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11943 diff changeset	269
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11943 diff changeset	270 int PyObject_AsReadBuffer(PyObject *obj,
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	271 const void **buffer,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	272 Py_ssize_t *buffer_len)
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11943 diff changeset	273 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	274 PyBufferProcs *pb;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	275 Py_buffer view;
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11943 diff changeset	276
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	277 if (obj == NULL \|\| buffer == NULL \|\| buffer_len == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	278 null_error();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	279 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	280 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	281 pb = obj->ob_type->tp_as_buffer;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	282 if (pb == NULL \|\|
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	283 pb->bf_getbuffer == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	284 PyErr_SetString(PyExc_TypeError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	285 "expected an object with a buffer interface");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	286 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	287 }
42665 85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: 42084 diff changeset	288
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	289 if ((*pb->bf_getbuffer)(obj, &view, PyBUF_SIMPLE)) return -1;
42665 85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: 42084 diff changeset	290
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	291 *buffer = view.buf;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	292 *buffer_len = view.len;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	293 if (pb->bf_releasebuffer != NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	294 (*pb->bf_releasebuffer)(obj, &view);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	295 Py_XDECREF(view.obj);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	296 return 0;
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11943 diff changeset	297 }
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11943 diff changeset	298
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11943 diff changeset	299 int PyObject_AsWriteBuffer(PyObject *obj,
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	300 void **buffer,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	301 Py_ssize_t *buffer_len)
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11943 diff changeset	302 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	303 PyBufferProcs *pb;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	304 Py_buffer view;
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11943 diff changeset	305
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	306 if (obj == NULL \|\| buffer == NULL \|\| buffer_len == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	307 null_error();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	308 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	309 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	310 pb = obj->ob_type->tp_as_buffer;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	311 if (pb == NULL \|\|
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	312 pb->bf_getbuffer == NULL \|\|
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	313 ((*pb->bf_getbuffer)(obj, &view, PyBUF_WRITABLE) != 0)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	314 PyErr_SetString(PyExc_TypeError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	315 "expected an object with a writable buffer interface");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	316 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	317 }
42665 85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: 42084 diff changeset	318
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	319 *buffer = view.buf;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	320 *buffer_len = view.len;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	321 if (pb->bf_releasebuffer != NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	322 (*pb->bf_releasebuffer)(obj, &view);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	323 Py_XDECREF(view.obj);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	324 return 0;
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11943 diff changeset	325 }
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11943 diff changeset	326
42665 85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: 42084 diff changeset	327 /* Buffer C-API for Python 3.0 */
85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: 42084 diff changeset	328
85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: 42084 diff changeset	329 int
43423 0476a2cc5658 Change PyBuffer to Py_buffer to be consistent with other non-object structures like Py_complex. Add some more functionality to the memoryview object. Travis E. Oliphant <oliphant@enthought.com> parents: 43384 diff changeset	330 PyObject_GetBuffer(PyObject obj, Py_buffer view, int flags)
42665 85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: 42084 diff changeset	331 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	332 if (!PyObject_CheckBuffer(obj)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	333 PyErr_Format(PyExc_TypeError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	334 "'%100s' does not support the buffer interface",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	335 Py_TYPE(obj)->tp_name);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	336 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	337 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	338 return (*(obj->ob_type->tp_as_buffer->bf_getbuffer))(obj, view, flags);
42665 85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: 42084 diff changeset	339 }
85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: 42084 diff changeset	340
85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: 42084 diff changeset	341 static int
43423 0476a2cc5658 Change PyBuffer to Py_buffer to be consistent with other non-object structures like Py_complex. Add some more functionality to the memoryview object. Travis E. Oliphant <oliphant@enthought.com> parents: 43384 diff changeset	342 _IsFortranContiguous(Py_buffer *view)
42665 85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: 42084 diff changeset	343 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	344 Py_ssize_t sd, dim;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	345 int i;
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43555 diff changeset	346
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	347 if (view->ndim == 0) return 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	348 if (view->strides == NULL) return (view->ndim == 1);
42665 85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: 42084 diff changeset	349
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	350 sd = view->itemsize;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	351 if (view->ndim == 1) return (view->shape[0] == 1 \|\|
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	352 sd == view->strides[0]);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	353 for (i=0; i<view->ndim; i++) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	354 dim = view->shape[i];
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	355 if (dim == 0) return 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	356 if (view->strides[i] != sd) return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	357 sd *= dim;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	358 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	359 return 1;
42665 85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: 42084 diff changeset	360 }
85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: 42084 diff changeset	361
85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: 42084 diff changeset	362 static int
43423 0476a2cc5658 Change PyBuffer to Py_buffer to be consistent with other non-object structures like Py_complex. Add some more functionality to the memoryview object. Travis E. Oliphant <oliphant@enthought.com> parents: 43384 diff changeset	363 _IsCContiguous(Py_buffer *view)
42665 85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: 42084 diff changeset	364 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	365 Py_ssize_t sd, dim;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	366 int i;
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43555 diff changeset	367
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	368 if (view->ndim == 0) return 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	369 if (view->strides == NULL) return 1;
42665 85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: 42084 diff changeset	370
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	371 sd = view->itemsize;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	372 if (view->ndim == 1) return (view->shape[0] == 1 \|\|
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	373 sd == view->strides[0]);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	374 for (i=view->ndim-1; i>=0; i--) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	375 dim = view->shape[i];
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	376 if (dim == 0) return 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	377 if (view->strides[i] != sd) return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	378 sd *= dim;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	379 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	380 return 1;
42665 85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: 42084 diff changeset	381 }
85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: 42084 diff changeset	382
85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: 42084 diff changeset	383 int
43423 0476a2cc5658 Change PyBuffer to Py_buffer to be consistent with other non-object structures like Py_complex. Add some more functionality to the memoryview object. Travis E. Oliphant <oliphant@enthought.com> parents: 43384 diff changeset	384 PyBuffer_IsContiguous(Py_buffer *view, char fort)
42665 85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: 42084 diff changeset	385 {
85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: 42084 diff changeset	386
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	387 if (view->suboffsets != NULL) return 0;
42665 85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: 42084 diff changeset	388
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	389 if (fort == 'C')
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	390 return _IsCContiguous(view);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	391 else if (fort == 'F')
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	392 return _IsFortranContiguous(view);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	393 else if (fort == 'A')
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	394 return (_IsCContiguous(view) \|\| _IsFortranContiguous(view));
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	395 return 0;
42665 85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: 42084 diff changeset	396 }
85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: 42084 diff changeset	397
85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: 42084 diff changeset	398
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43555 diff changeset	399 void*
43423 0476a2cc5658 Change PyBuffer to Py_buffer to be consistent with other non-object structures like Py_complex. Add some more functionality to the memoryview object. Travis E. Oliphant <oliphant@enthought.com> parents: 43384 diff changeset	400 PyBuffer_GetPointer(Py_buffer view, Py_ssize_t indices)
42665 85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: 42084 diff changeset	401 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	402 char* pointer;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	403 int i;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	404 pointer = (char *)view->buf;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	405 for (i = 0; i < view->ndim; i++) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	406 pointer += view->strides[i]*indices[i];
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	407 if ((view->suboffsets != NULL) && (view->suboffsets[i] >= 0)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	408 pointer = ((char*)pointer) + view->suboffsets[i];
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	409 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	410 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	411 return (void*)pointer;
42665 85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: 42084 diff changeset	412 }
85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: 42084 diff changeset	413
85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: 42084 diff changeset	414
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43555 diff changeset	415 void
64344 b3b8d08f9d06 Merged revisions 84391 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 62610 diff changeset	416 _Py_add_one_to_index_F(int nd, Py_ssize_t index, const Py_ssize_t shape)
42665 85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: 42084 diff changeset	417 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	418 int k;
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43555 diff changeset	419
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	420 for (k=0; k<nd; k++) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	421 if (index[k] < shape[k]-1) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	422 index[k]++;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	423 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	424 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	425 else {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	426 index[k] = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	427 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	428 }
42665 85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: 42084 diff changeset	429 }
85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: 42084 diff changeset	430
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43555 diff changeset	431 void
64344 b3b8d08f9d06 Merged revisions 84391 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 62610 diff changeset	432 _Py_add_one_to_index_C(int nd, Py_ssize_t index, const Py_ssize_t shape)
42665 85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: 42084 diff changeset	433 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	434 int k;
42665 85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: 42084 diff changeset	435
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	436 for (k=nd-1; k>=0; k--) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	437 if (index[k] < shape[k]-1) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	438 index[k]++;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	439 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	440 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	441 else {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	442 index[k] = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	443 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	444 }
42665 85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: 42084 diff changeset	445 }
85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: 42084 diff changeset	446
85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: 42084 diff changeset	447 /* view is not checked for consistency in either of these. It is
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43555 diff changeset	448 assumed that the size of the buffer is view->len in
42665 85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: 42084 diff changeset	449 view->len / view->itemsize elements.
85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: 42084 diff changeset	450 */
85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: 42084 diff changeset	451
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43555 diff changeset	452 int
43423 0476a2cc5658 Change PyBuffer to Py_buffer to be consistent with other non-object structures like Py_complex. Add some more functionality to the memoryview object. Travis E. Oliphant <oliphant@enthought.com> parents: 43384 diff changeset	453 PyBuffer_ToContiguous(void buf, Py_buffer view, Py_ssize_t len, char fort)
42665 85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: 42084 diff changeset	454 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	455 int k;
64344 b3b8d08f9d06 Merged revisions 84391 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 62610 diff changeset	456 void (addone)(int, Py_ssize_t , const Py_ssize_t *);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	457 Py_ssize_t *indices, elements;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	458 char dest, ptr;
42665 85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: 42084 diff changeset	459
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	460 if (len > view->len) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	461 len = view->len;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	462 }
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43555 diff changeset	463
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	464 if (PyBuffer_IsContiguous(view, fort)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	465 /* simplest copy is all that is needed */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	466 memcpy(buf, view->buf, len);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	467 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	468 }
42665 85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: 42084 diff changeset	469
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	470 /* Otherwise a more elaborate scheme is needed */
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43555 diff changeset	471
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	472 /* XXX(nnorwitz): need to check for overflow! */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	473 indices = (Py_ssize_t )PyMem_Malloc(sizeof(Py_ssize_t)(view->ndim));
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	474 if (indices == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	475 PyErr_NoMemory();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	476 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	477 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	478 for (k=0; k<view->ndim;k++) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	479 indices[k] = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	480 }
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43555 diff changeset	481
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	482 if (fort == 'F') {
64344 b3b8d08f9d06 Merged revisions 84391 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 62610 diff changeset	483 addone = _Py_add_one_to_index_F;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	484 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	485 else {
64344 b3b8d08f9d06 Merged revisions 84391 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 62610 diff changeset	486 addone = _Py_add_one_to_index_C;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	487 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	488 dest = buf;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	489 /* XXX : This is not going to be the fastest code in the world
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	490 several optimizations are possible.
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	491 */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	492 elements = len / view->itemsize;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	493 while (elements--) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	494 addone(view->ndim, indices, view->shape);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	495 ptr = PyBuffer_GetPointer(view, indices);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	496 memcpy(dest, ptr, view->itemsize);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	497 dest += view->itemsize;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	498 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	499 PyMem_Free(indices);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	500 return 0;
42665 85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: 42084 diff changeset	501 }
85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: 42084 diff changeset	502
85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: 42084 diff changeset	503 int
43423 0476a2cc5658 Change PyBuffer to Py_buffer to be consistent with other non-object structures like Py_complex. Add some more functionality to the memoryview object. Travis E. Oliphant <oliphant@enthought.com> parents: 43384 diff changeset	504 PyBuffer_FromContiguous(Py_buffer view, void buf, Py_ssize_t len, char fort)
42665 85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: 42084 diff changeset	505 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	506 int k;
64344 b3b8d08f9d06 Merged revisions 84391 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 62610 diff changeset	507 void (addone)(int, Py_ssize_t , const Py_ssize_t *);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	508 Py_ssize_t *indices, elements;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	509 char src, ptr;
42665 85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: 42084 diff changeset	510
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	511 if (len > view->len) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	512 len = view->len;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	513 }
42665 85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: 42084 diff changeset	514
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	515 if (PyBuffer_IsContiguous(view, fort)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	516 /* simplest copy is all that is needed */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	517 memcpy(view->buf, buf, len);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	518 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	519 }
42665 85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: 42084 diff changeset	520
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	521 /* Otherwise a more elaborate scheme is needed */
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43555 diff changeset	522
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	523 /* XXX(nnorwitz): need to check for overflow! */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	524 indices = (Py_ssize_t )PyMem_Malloc(sizeof(Py_ssize_t)(view->ndim));
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	525 if (indices == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	526 PyErr_NoMemory();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	527 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	528 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	529 for (k=0; k<view->ndim;k++) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	530 indices[k] = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	531 }
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43555 diff changeset	532
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	533 if (fort == 'F') {
64344 b3b8d08f9d06 Merged revisions 84391 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 62610 diff changeset	534 addone = _Py_add_one_to_index_F;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	535 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	536 else {
64344 b3b8d08f9d06 Merged revisions 84391 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 62610 diff changeset	537 addone = _Py_add_one_to_index_C;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	538 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	539 src = buf;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	540 /* XXX : This is not going to be the fastest code in the world
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	541 several optimizations are possible.
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	542 */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	543 elements = len / view->itemsize;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	544 while (elements--) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	545 addone(view->ndim, indices, view->shape);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	546 ptr = PyBuffer_GetPointer(view, indices);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	547 memcpy(ptr, src, view->itemsize);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	548 src += view->itemsize;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	549 }
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43555 diff changeset	550
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	551 PyMem_Free(indices);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	552 return 0;
42665 85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: 42084 diff changeset	553 }
85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: 42084 diff changeset	554
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43555 diff changeset	555 int PyObject_CopyData(PyObject dest, PyObject src)
42665 85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: 42084 diff changeset	556 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	557 Py_buffer view_dest, view_src;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	558 int k;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	559 Py_ssize_t *indices, elements;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	560 char dptr, sptr;
42665 85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: 42084 diff changeset	561
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	562 if (!PyObject_CheckBuffer(dest) \|\|
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	563 !PyObject_CheckBuffer(src)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	564 PyErr_SetString(PyExc_TypeError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	565 "both destination and source must have the "\
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	566 "buffer interface");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	567 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	568 }
42665 85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: 42084 diff changeset	569
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	570 if (PyObject_GetBuffer(dest, &view_dest, PyBUF_FULL) != 0) return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	571 if (PyObject_GetBuffer(src, &view_src, PyBUF_FULL_RO) != 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	572 PyBuffer_Release(&view_dest);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	573 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	574 }
42665 85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: 42084 diff changeset	575
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	576 if (view_dest.len < view_src.len) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	577 PyErr_SetString(PyExc_BufferError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	578 "destination is too small to receive data from source");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	579 PyBuffer_Release(&view_dest);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	580 PyBuffer_Release(&view_src);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	581 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	582 }
42665 85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: 42084 diff changeset	583
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	584 if ((PyBuffer_IsContiguous(&view_dest, 'C') &&
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	585 PyBuffer_IsContiguous(&view_src, 'C')) \|\|
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	586 (PyBuffer_IsContiguous(&view_dest, 'F') &&
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	587 PyBuffer_IsContiguous(&view_src, 'F'))) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	588 /* simplest copy is all that is needed */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	589 memcpy(view_dest.buf, view_src.buf, view_src.len);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	590 PyBuffer_Release(&view_dest);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	591 PyBuffer_Release(&view_src);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	592 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	593 }
42665 85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: 42084 diff changeset	594
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	595 /* Otherwise a more elaborate copy scheme is needed */
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43555 diff changeset	596
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	597 /* XXX(nnorwitz): need to check for overflow! */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	598 indices = (Py_ssize_t )PyMem_Malloc(sizeof(Py_ssize_t)view_src.ndim);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	599 if (indices == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	600 PyErr_NoMemory();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	601 PyBuffer_Release(&view_dest);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	602 PyBuffer_Release(&view_src);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	603 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	604 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	605 for (k=0; k<view_src.ndim;k++) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	606 indices[k] = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	607 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	608 elements = 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	609 for (k=0; k<view_src.ndim; k++) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	610 /* XXX(nnorwitz): can this overflow? */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	611 elements *= view_src.shape[k];
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	612 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	613 while (elements--) {
64344 b3b8d08f9d06 Merged revisions 84391 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 62610 diff changeset	614 _Py_add_one_to_index_C(view_src.ndim, indices, view_src.shape);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	615 dptr = PyBuffer_GetPointer(&view_dest, indices);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	616 sptr = PyBuffer_GetPointer(&view_src, indices);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	617 memcpy(dptr, sptr, view_src.itemsize);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	618 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	619 PyMem_Free(indices);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	620 PyBuffer_Release(&view_dest);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	621 PyBuffer_Release(&view_src);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	622 return 0;
42665 85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: 42084 diff changeset	623 }
85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: 42084 diff changeset	624
85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: 42084 diff changeset	625 void
85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: 42084 diff changeset	626 PyBuffer_FillContiguousStrides(int nd, Py_ssize_t *shape,
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	627 Py_ssize_t *strides, int itemsize,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	628 char fort)
42665 85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: 42084 diff changeset	629 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	630 int k;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	631 Py_ssize_t sd;
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43555 diff changeset	632
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	633 sd = itemsize;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	634 if (fort == 'F') {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	635 for (k=0; k<nd; k++) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	636 strides[k] = sd;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	637 sd *= shape[k];
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	638 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	639 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	640 else {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	641 for (k=nd-1; k>=0; k--) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	642 strides[k] = sd;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	643 sd *= shape[k];
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	644 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	645 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	646 return;
42665 85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: 42084 diff changeset	647 }
85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: 42084 diff changeset	648
85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: 42084 diff changeset	649 int
48683 cd3b0b7fd8e1 Merged revisions 65654 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 48494 diff changeset	650 PyBuffer_FillInfo(Py_buffer view, PyObject obj, void *buf, Py_ssize_t len,
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	651 int readonly, int flags)
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43555 diff changeset	652 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	653 if (view == NULL) return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	654 if (((flags & PyBUF_WRITABLE) == PyBUF_WRITABLE) &&
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	655 (readonly == 1)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	656 PyErr_SetString(PyExc_BufferError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	657 "Object is not writable.");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	658 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	659 }
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43555 diff changeset	660
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	661 view->obj = obj;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	662 if (obj)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	663 Py_INCREF(obj);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	664 view->buf = buf;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	665 view->len = len;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	666 view->readonly = readonly;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	667 view->itemsize = 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	668 view->format = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	669 if ((flags & PyBUF_FORMAT) == PyBUF_FORMAT)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	670 view->format = "B";
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	671 view->ndim = 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	672 view->shape = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	673 if ((flags & PyBUF_ND) == PyBUF_ND)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	674 view->shape = &(view->len);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	675 view->strides = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	676 if ((flags & PyBUF_STRIDES) == PyBUF_STRIDES)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	677 view->strides = &(view->itemsize);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	678 view->suboffsets = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	679 view->internal = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	680 return 0;
42665 85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: 42084 diff changeset	681 }
85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: 42084 diff changeset	682
48683 cd3b0b7fd8e1 Merged revisions 65654 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 48494 diff changeset	683 void
cd3b0b7fd8e1 Merged revisions 65654 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 48494 diff changeset	684 PyBuffer_Release(Py_buffer *view)
cd3b0b7fd8e1 Merged revisions 65654 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 48494 diff changeset	685 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	686 PyObject *obj = view->obj;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	687 if (obj && Py_TYPE(obj)->tp_as_buffer && Py_TYPE(obj)->tp_as_buffer->bf_releasebuffer)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	688 Py_TYPE(obj)->tp_as_buffer->bf_releasebuffer(obj, view);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	689 Py_XDECREF(obj);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	690 view->obj = NULL;
48683 cd3b0b7fd8e1 Merged revisions 65654 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 48494 diff changeset	691 }
cd3b0b7fd8e1 Merged revisions 65654 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 48494 diff changeset	692
45382 7af955843929 Fixes for shared 2.6 code that implements PEP 3101, advanced string Eric Smith <eric@trueblade.com> parents: 45371 diff changeset	693 PyObject *
7af955843929 Fixes for shared 2.6 code that implements PEP 3101, advanced string Eric Smith <eric@trueblade.com> parents: 45371 diff changeset	694 PyObject_Format(PyObject obj, PyObject format_spec)
7af955843929 Fixes for shared 2.6 code that implements PEP 3101, advanced string Eric Smith <eric@trueblade.com> parents: 45371 diff changeset	695 {
7af955843929 Fixes for shared 2.6 code that implements PEP 3101, advanced string Eric Smith <eric@trueblade.com> parents: 45371 diff changeset	696 PyObject *meth;
7af955843929 Fixes for shared 2.6 code that implements PEP 3101, advanced string Eric Smith <eric@trueblade.com> parents: 45371 diff changeset	697 PyObject *empty = NULL;
7af955843929 Fixes for shared 2.6 code that implements PEP 3101, advanced string Eric Smith <eric@trueblade.com> parents: 45371 diff changeset	698 PyObject *result = NULL;
62085 9bb5c22ef134 Merged revisions 81706-81707 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 61466 diff changeset	699 static PyObject *format_cache = NULL;
45382 7af955843929 Fixes for shared 2.6 code that implements PEP 3101, advanced string Eric Smith <eric@trueblade.com> parents: 45371 diff changeset	700
7af955843929 Fixes for shared 2.6 code that implements PEP 3101, advanced string Eric Smith <eric@trueblade.com> parents: 45371 diff changeset	701 /* If no format_spec is provided, use an empty string */
7af955843929 Fixes for shared 2.6 code that implements PEP 3101, advanced string Eric Smith <eric@trueblade.com> parents: 45371 diff changeset	702 if (format_spec == NULL) {
62085 9bb5c22ef134 Merged revisions 81706-81707 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 61466 diff changeset	703 empty = PyUnicode_FromUnicode(NULL, 0);
9bb5c22ef134 Merged revisions 81706-81707 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 61466 diff changeset	704 format_spec = empty;
45382 7af955843929 Fixes for shared 2.6 code that implements PEP 3101, advanced string Eric Smith <eric@trueblade.com> parents: 45371 diff changeset	705 }
7af955843929 Fixes for shared 2.6 code that implements PEP 3101, advanced string Eric Smith <eric@trueblade.com> parents: 45371 diff changeset	706
7af955843929 Fixes for shared 2.6 code that implements PEP 3101, advanced string Eric Smith <eric@trueblade.com> parents: 45371 diff changeset	707 /* Find the (unbound!) __format__ method (a borrowed reference) */
62085 9bb5c22ef134 Merged revisions 81706-81707 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 61466 diff changeset	708 meth = _PyObject_LookupSpecial(obj, "__format__", &format_cache);
45382 7af955843929 Fixes for shared 2.6 code that implements PEP 3101, advanced string Eric Smith <eric@trueblade.com> parents: 45371 diff changeset	709 if (meth == NULL) {
62085 9bb5c22ef134 Merged revisions 81706-81707 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 61466 diff changeset	710 if (!PyErr_Occurred())
9bb5c22ef134 Merged revisions 81706-81707 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 61466 diff changeset	711 PyErr_Format(PyExc_TypeError,
9bb5c22ef134 Merged revisions 81706-81707 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 61466 diff changeset	712 "Type %.100s doesn't define __format__",
9bb5c22ef134 Merged revisions 81706-81707 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 61466 diff changeset	713 Py_TYPE(obj)->tp_name);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	714 goto done;
45382 7af955843929 Fixes for shared 2.6 code that implements PEP 3101, advanced string Eric Smith <eric@trueblade.com> parents: 45371 diff changeset	715 }
7af955843929 Fixes for shared 2.6 code that implements PEP 3101, advanced string Eric Smith <eric@trueblade.com> parents: 45371 diff changeset	716
62085 9bb5c22ef134 Merged revisions 81706-81707 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 61466 diff changeset	717 /* And call it. */
9bb5c22ef134 Merged revisions 81706-81707 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 61466 diff changeset	718 result = PyObject_CallFunctionObjArgs(meth, format_spec, NULL);
62090 60613e81fb1e Merged revisions 81712 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 62085 diff changeset	719 Py_DECREF(meth);
45382 7af955843929 Fixes for shared 2.6 code that implements PEP 3101, advanced string Eric Smith <eric@trueblade.com> parents: 45371 diff changeset	720
7af955843929 Fixes for shared 2.6 code that implements PEP 3101, advanced string Eric Smith <eric@trueblade.com> parents: 45371 diff changeset	721 if (result && !PyUnicode_Check(result)) {
62085 9bb5c22ef134 Merged revisions 81706-81707 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 61466 diff changeset	722 PyErr_SetString(PyExc_TypeError,
9bb5c22ef134 Merged revisions 81706-81707 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 61466 diff changeset	723 "__format__ method did not return string");
9bb5c22ef134 Merged revisions 81706-81707 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 61466 diff changeset	724 Py_DECREF(result);
9bb5c22ef134 Merged revisions 81706-81707 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 61466 diff changeset	725 result = NULL;
9bb5c22ef134 Merged revisions 81706-81707 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 61466 diff changeset	726 goto done;
45382 7af955843929 Fixes for shared 2.6 code that implements PEP 3101, advanced string Eric Smith <eric@trueblade.com> parents: 45371 diff changeset	727 }
7af955843929 Fixes for shared 2.6 code that implements PEP 3101, advanced string Eric Smith <eric@trueblade.com> parents: 45371 diff changeset	728
7af955843929 Fixes for shared 2.6 code that implements PEP 3101, advanced string Eric Smith <eric@trueblade.com> parents: 45371 diff changeset	729 done:
7af955843929 Fixes for shared 2.6 code that implements PEP 3101, advanced string Eric Smith <eric@trueblade.com> parents: 45371 diff changeset	730 Py_XDECREF(empty);
7af955843929 Fixes for shared 2.6 code that implements PEP 3101, advanced string Eric Smith <eric@trueblade.com> parents: 45371 diff changeset	731 return result;
7af955843929 Fixes for shared 2.6 code that implements PEP 3101, advanced string Eric Smith <eric@trueblade.com> parents: 45371 diff changeset	732 }
8400 6270c6bad811 Completely reformatted, standardizing indentation as well as Guido van Rossum <guido@python.org> parents: 7854 diff changeset	733 /* Operations on numbers */
6270c6bad811 Completely reformatted, standardizing indentation as well as Guido van Rossum <guido@python.org> parents: 7854 diff changeset	734
6270c6bad811 Completely reformatted, standardizing indentation as well as Guido van Rossum <guido@python.org> parents: 7854 diff changeset	735 int
13449 0409a98cd582 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	736 PyNumber_Check(PyObject *o)
2840 d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	737 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	738 return o && o->ob_type->tp_as_number &&
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	739 (o->ob_type->tp_as_number->nb_int \|\|
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	740 o->ob_type->tp_as_number->nb_float);
2840 d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	741 }
d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	742
8400 6270c6bad811 Completely reformatted, standardizing indentation as well as Guido van Rossum <guido@python.org> parents: 7854 diff changeset	743 /* Binary operators */
2840 d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	744
15721 ead8b5b994ad Massive changes as per PEP 208. Read it for details. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15029 diff changeset	745 #define NB_SLOT(x) offsetof(PyNumberMethods, x)
ead8b5b994ad Massive changes as per PEP 208. Read it for details. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15029 diff changeset	746 #define NB_BINOP(nb_methods, slot) \
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	747 ((binaryfunc)(& ((char*)nb_methods)[slot]))
15721 ead8b5b994ad Massive changes as per PEP 208. Read it for details. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15029 diff changeset	748 #define NB_TERNOP(nb_methods, slot) \
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	749 ((ternaryfunc)(& ((char*)nb_methods)[slot]))
15721 ead8b5b994ad Massive changes as per PEP 208. Read it for details. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15029 diff changeset	750
ead8b5b994ad Massive changes as per PEP 208. Read it for details. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15029 diff changeset	751 /*
ead8b5b994ad Massive changes as per PEP 208. Read it for details. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15029 diff changeset	752 Calling scheme used for binary operations:
2840 d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	753
39603 40bbe669b089 Get rid of most of the rest of coerce (slot is still there for now). Neal Norwitz <nnorwitz@gmail.com> parents: 39536 diff changeset	754 Order operations are tried until either a valid result or error:
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	755 w.op(v,w)[*], v.op(v,w), w.op(v,w)
15721 ead8b5b994ad Massive changes as per PEP 208. Read it for details. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15029 diff changeset	756
20169 abd6a08b2c32 It's a fact: for binary operators, under certain circumstances, Guido van Rossum <guido@python.org> parents: 19910 diff changeset	757 [*] only when v->ob_type != w->ob_type && w->ob_type is a subclass of
abd6a08b2c32 It's a fact: for binary operators, under certain circumstances, Guido van Rossum <guido@python.org> parents: 19910 diff changeset	758 v->ob_type
15721 ead8b5b994ad Massive changes as per PEP 208. Read it for details. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15029 diff changeset	759 */
ead8b5b994ad Massive changes as per PEP 208. Read it for details. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15029 diff changeset	760
ead8b5b994ad Massive changes as per PEP 208. Read it for details. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15029 diff changeset	761 static PyObject *
ead8b5b994ad Massive changes as per PEP 208. Read it for details. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15029 diff changeset	762 binary_op1(PyObject v, PyObject w, const int op_slot)
2840 d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	763 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	764 PyObject *x;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	765 binaryfunc slotv = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	766 binaryfunc slotw = NULL;
20169 abd6a08b2c32 It's a fact: for binary operators, under certain circumstances, Guido van Rossum <guido@python.org> parents: 19910 diff changeset	767
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	768 if (v->ob_type->tp_as_number != NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	769 slotv = NB_BINOP(v->ob_type->tp_as_number, op_slot);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	770 if (w->ob_type != v->ob_type &&
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	771 w->ob_type->tp_as_number != NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	772 slotw = NB_BINOP(w->ob_type->tp_as_number, op_slot);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	773 if (slotw == slotv)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	774 slotw = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	775 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	776 if (slotv) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	777 if (slotw && PyType_IsSubtype(w->ob_type, v->ob_type)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	778 x = slotw(v, w);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	779 if (x != Py_NotImplemented)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	780 return x;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	781 Py_DECREF(x); /* can't do it */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	782 slotw = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	783 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	784 x = slotv(v, w);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	785 if (x != Py_NotImplemented)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	786 return x;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	787 Py_DECREF(x); /* can't do it */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	788 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	789 if (slotw) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	790 x = slotw(v, w);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	791 if (x != Py_NotImplemented)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	792 return x;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	793 Py_DECREF(x); /* can't do it */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	794 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	795 Py_INCREF(Py_NotImplemented);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	796 return Py_NotImplemented;
2840 d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	797 }
23089 314f92a24293 Whitespace normalization and fold some long lines. Guido van Rossum <guido@python.org> parents: 22194 diff changeset	798
15721 ead8b5b994ad Massive changes as per PEP 208. Read it for details. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15029 diff changeset	799 static PyObject *
26865 aaca8a3b23cd Always try nb_* slots before trying sq_concat, sq_inplace_concat, sq_repeat, Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 26622 diff changeset	800 binop_type_error(PyObject v, PyObject w, const char *op_name)
aaca8a3b23cd Always try nb_* slots before trying sq_concat, sq_inplace_concat, sq_repeat, Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 26622 diff changeset	801 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	802 PyErr_Format(PyExc_TypeError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	803 "unsupported operand type(s) for %.100s: "
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	804 "'%.100s' and '%.100s'",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	805 op_name,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	806 v->ob_type->tp_name,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	807 w->ob_type->tp_name);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	808 return NULL;
26865 aaca8a3b23cd Always try nb_* slots before trying sq_concat, sq_inplace_concat, sq_repeat, Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 26622 diff changeset	809 }
aaca8a3b23cd Always try nb_* slots before trying sq_concat, sq_inplace_concat, sq_repeat, Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 26622 diff changeset	810
aaca8a3b23cd Always try nb_* slots before trying sq_concat, sq_inplace_concat, sq_repeat, Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 26622 diff changeset	811 static PyObject *
15721 ead8b5b994ad Massive changes as per PEP 208. Read it for details. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15029 diff changeset	812 binary_op(PyObject v, PyObject w, const int op_slot, const char *op_name)
2840 d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	813 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	814 PyObject *result = binary_op1(v, w, op_slot);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	815 if (result == Py_NotImplemented) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	816 Py_DECREF(result);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	817 return binop_type_error(v, w, op_name);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	818 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	819 return result;
2840 d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	820 }
d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	821
15721 ead8b5b994ad Massive changes as per PEP 208. Read it for details. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15029 diff changeset	822
ead8b5b994ad Massive changes as per PEP 208. Read it for details. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15029 diff changeset	823 /*
ead8b5b994ad Massive changes as per PEP 208. Read it for details. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15029 diff changeset	824 Calling scheme used for ternary operations:
ead8b5b994ad Massive changes as per PEP 208. Read it for details. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15029 diff changeset	825
39603 40bbe669b089 Get rid of most of the rest of coerce (slot is still there for now). Neal Norwitz <nnorwitz@gmail.com> parents: 39536 diff changeset	826 Order operations are tried until either a valid result or error:
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	827 v.op(v,w,z), w.op(v,w,z), z.op(v,w,z)
15721 ead8b5b994ad Massive changes as per PEP 208. Read it for details. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15029 diff changeset	828 */
ead8b5b994ad Massive changes as per PEP 208. Read it for details. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15029 diff changeset	829
ead8b5b994ad Massive changes as per PEP 208. Read it for details. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15029 diff changeset	830 static PyObject *
ead8b5b994ad Massive changes as per PEP 208. Read it for details. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15029 diff changeset	831 ternary_op(PyObject *v,
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	832 PyObject *w,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	833 PyObject *z,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	834 const int op_slot,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	835 const char *op_name)
2840 d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	836 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	837 PyNumberMethods mv, mw, *mz;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	838 PyObject *x = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	839 ternaryfunc slotv = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	840 ternaryfunc slotw = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	841 ternaryfunc slotz = NULL;
23089 314f92a24293 Whitespace normalization and fold some long lines. Guido van Rossum <guido@python.org> parents: 22194 diff changeset	842
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	843 mv = v->ob_type->tp_as_number;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	844 mw = w->ob_type->tp_as_number;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	845 if (mv != NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	846 slotv = NB_TERNOP(mv, op_slot);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	847 if (w->ob_type != v->ob_type &&
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	848 mw != NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	849 slotw = NB_TERNOP(mw, op_slot);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	850 if (slotw == slotv)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	851 slotw = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	852 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	853 if (slotv) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	854 if (slotw && PyType_IsSubtype(w->ob_type, v->ob_type)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	855 x = slotw(v, w, z);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	856 if (x != Py_NotImplemented)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	857 return x;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	858 Py_DECREF(x); /* can't do it */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	859 slotw = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	860 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	861 x = slotv(v, w, z);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	862 if (x != Py_NotImplemented)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	863 return x;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	864 Py_DECREF(x); /* can't do it */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	865 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	866 if (slotw) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	867 x = slotw(v, w, z);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	868 if (x != Py_NotImplemented)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	869 return x;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	870 Py_DECREF(x); /* can't do it */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	871 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	872 mz = z->ob_type->tp_as_number;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	873 if (mz != NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	874 slotz = NB_TERNOP(mz, op_slot);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	875 if (slotz == slotv \|\| slotz == slotw)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	876 slotz = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	877 if (slotz) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	878 x = slotz(v, w, z);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	879 if (x != Py_NotImplemented)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	880 return x;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	881 Py_DECREF(x); /* can't do it */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	882 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	883 }
15721 ead8b5b994ad Massive changes as per PEP 208. Read it for details. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15029 diff changeset	884
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	885 if (z == Py_None)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	886 PyErr_Format(
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	887 PyExc_TypeError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	888 "unsupported operand type(s) for ** or pow(): "
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	889 "'%.100s' and '%.100s'",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	890 v->ob_type->tp_name,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	891 w->ob_type->tp_name);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	892 else
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	893 PyErr_Format(
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	894 PyExc_TypeError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	895 "unsupported operand type(s) for pow(): "
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	896 "'%.100s', '%.100s', '%.100s'",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	897 v->ob_type->tp_name,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	898 w->ob_type->tp_name,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	899 z->ob_type->tp_name);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	900 return NULL;
2840 d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	901 }
d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	902
15721 ead8b5b994ad Massive changes as per PEP 208. Read it for details. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15029 diff changeset	903 #define BINARY_FUNC(func, op, op_name) \
ead8b5b994ad Massive changes as per PEP 208. Read it for details. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15029 diff changeset	904 PyObject * \
ead8b5b994ad Massive changes as per PEP 208. Read it for details. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15029 diff changeset	905 func(PyObject v, PyObject w) { \
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	906 return binary_op(v, w, NB_SLOT(op), op_name); \
15721 ead8b5b994ad Massive changes as per PEP 208. Read it for details. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15029 diff changeset	907 }
2840 d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	908
15721 ead8b5b994ad Massive changes as per PEP 208. Read it for details. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15029 diff changeset	909 BINARY_FUNC(PyNumber_Or, nb_or, "\|")
ead8b5b994ad Massive changes as per PEP 208. Read it for details. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15029 diff changeset	910 BINARY_FUNC(PyNumber_Xor, nb_xor, "^")
ead8b5b994ad Massive changes as per PEP 208. Read it for details. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15029 diff changeset	911 BINARY_FUNC(PyNumber_And, nb_and, "&")
ead8b5b994ad Massive changes as per PEP 208. Read it for details. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15029 diff changeset	912 BINARY_FUNC(PyNumber_Lshift, nb_lshift, "<<")
ead8b5b994ad Massive changes as per PEP 208. Read it for details. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15029 diff changeset	913 BINARY_FUNC(PyNumber_Rshift, nb_rshift, ">>")
ead8b5b994ad Massive changes as per PEP 208. Read it for details. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15029 diff changeset	914 BINARY_FUNC(PyNumber_Subtract, nb_subtract, "-")
ead8b5b994ad Massive changes as per PEP 208. Read it for details. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15029 diff changeset	915 BINARY_FUNC(PyNumber_Divmod, nb_divmod, "divmod()")
2840 d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	916
d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	917 PyObject *
13449 0409a98cd582 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	918 PyNumber_Add(PyObject v, PyObject w)
2840 d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	919 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	920 PyObject *result = binary_op1(v, w, NB_SLOT(nb_add));
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	921 if (result == Py_NotImplemented) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	922 PySequenceMethods *m = v->ob_type->tp_as_sequence;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	923 Py_DECREF(result);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	924 if (m && m->sq_concat) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	925 return (*m->sq_concat)(v, w);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	926 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	927 result = binop_type_error(v, w, "+");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	928 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	929 return result;
2840 d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	930 }
d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	931
26865 aaca8a3b23cd Always try nb_* slots before trying sq_concat, sq_inplace_concat, sq_repeat, Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 26622 diff changeset	932 static PyObject *
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36484 diff changeset	933 sequence_repeat(ssizeargfunc repeatfunc, PyObject seq, PyObject n)
26865 aaca8a3b23cd Always try nb_* slots before trying sq_concat, sq_inplace_concat, sq_repeat, Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 26622 diff changeset	934 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	935 Py_ssize_t count;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	936 if (PyIndex_Check(n)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	937 count = PyNumber_AsSsize_t(n, PyExc_OverflowError);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	938 if (count == -1 && PyErr_Occurred())
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	939 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	940 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	941 else {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	942 return type_error("can't multiply sequence by "
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	943 "non-int of type '%.200s'", n);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	944 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	945 return (*repeatfunc)(seq, count);
26865 aaca8a3b23cd Always try nb_* slots before trying sq_concat, sq_inplace_concat, sq_repeat, Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 26622 diff changeset	946 }
aaca8a3b23cd Always try nb_* slots before trying sq_concat, sq_inplace_concat, sq_repeat, Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 26622 diff changeset	947
aaca8a3b23cd Always try nb_* slots before trying sq_concat, sq_inplace_concat, sq_repeat, Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 26622 diff changeset	948 PyObject *
aaca8a3b23cd Always try nb_* slots before trying sq_concat, sq_inplace_concat, sq_repeat, Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 26622 diff changeset	949 PyNumber_Multiply(PyObject v, PyObject w)
aaca8a3b23cd Always try nb_* slots before trying sq_concat, sq_inplace_concat, sq_repeat, Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 26622 diff changeset	950 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	951 PyObject *result = binary_op1(v, w, NB_SLOT(nb_multiply));
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	952 if (result == Py_NotImplemented) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	953 PySequenceMethods *mv = v->ob_type->tp_as_sequence;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	954 PySequenceMethods *mw = w->ob_type->tp_as_sequence;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	955 Py_DECREF(result);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	956 if (mv && mv->sq_repeat) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	957 return sequence_repeat(mv->sq_repeat, v, w);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	958 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	959 else if (mw && mw->sq_repeat) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	960 return sequence_repeat(mw->sq_repeat, w, v);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	961 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	962 result = binop_type_error(v, w, "*");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	963 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	964 return result;
26865 aaca8a3b23cd Always try nb_* slots before trying sq_concat, sq_inplace_concat, sq_repeat, Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 26622 diff changeset	965 }
aaca8a3b23cd Always try nb_* slots before trying sq_concat, sq_inplace_concat, sq_repeat, Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 26622 diff changeset	966
2840 d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	967 PyObject *
19051 f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	968 PyNumber_FloorDivide(PyObject v, PyObject w)
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	969 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	970 return binary_op(v, w, NB_SLOT(nb_floor_divide), "//");
19051 f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	971 }
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	972
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	973 PyObject *
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	974 PyNumber_TrueDivide(PyObject v, PyObject w)
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	975 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	976 return binary_op(v, w, NB_SLOT(nb_true_divide), "/");
19051 f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	977 }
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	978
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	979 PyObject *
13449 0409a98cd582 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	980 PyNumber_Remainder(PyObject v, PyObject w)
2840 d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	981 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	982 return binary_op(v, w, NB_SLOT(nb_remainder), "%");
2840 d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	983 }
d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	984
d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	985 PyObject *
13449 0409a98cd582 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	986 PyNumber_Power(PyObject v, PyObject w, PyObject *z)
2840 d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	987 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	988 return ternary_op(v, w, z, NB_SLOT(nb_power), "** or pow()");
2840 d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	989 }
d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	990
14161 52fd496d3532 Support for the in-place operations introduced by augmented assignment. Only Thomas Wouters <thomas@python.org> parents: 14146 diff changeset	991 /* Binary in-place operators */
52fd496d3532 Support for the in-place operations introduced by augmented assignment. Only Thomas Wouters <thomas@python.org> parents: 14146 diff changeset	992
52fd496d3532 Support for the in-place operations introduced by augmented assignment. Only Thomas Wouters <thomas@python.org> parents: 14146 diff changeset	993 /* The in-place operators are defined to fall back to the 'normal',
15721 ead8b5b994ad Massive changes as per PEP 208. Read it for details. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15029 diff changeset	994 non in-place operations, if the in-place methods are not in place.
14161 52fd496d3532 Support for the in-place operations introduced by augmented assignment. Only Thomas Wouters <thomas@python.org> parents: 14146 diff changeset	995
15721 ead8b5b994ad Massive changes as per PEP 208. Read it for details. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15029 diff changeset	996 - If the left hand object has the appropriate struct members, and
ead8b5b994ad Massive changes as per PEP 208. Read it for details. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15029 diff changeset	997 they are filled, call the appropriate function and return the
ead8b5b994ad Massive changes as per PEP 208. Read it for details. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15029 diff changeset	998 result. No coercion is done on the arguments; the left-hand object
ead8b5b994ad Massive changes as per PEP 208. Read it for details. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15029 diff changeset	999 is the one the operation is performed on, and it's up to the
ead8b5b994ad Massive changes as per PEP 208. Read it for details. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15029 diff changeset	1000 function to deal with the right-hand object.
23089 314f92a24293 Whitespace normalization and fold some long lines. Guido van Rossum <guido@python.org> parents: 22194 diff changeset	1001
14161 52fd496d3532 Support for the in-place operations introduced by augmented assignment. Only Thomas Wouters <thomas@python.org> parents: 14146 diff changeset	1002 - Otherwise, in-place modification is not supported. Handle it exactly as
15721 ead8b5b994ad Massive changes as per PEP 208. Read it for details. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15029 diff changeset	1003 a non in-place operation of the same kind.
14161 52fd496d3532 Support for the in-place operations introduced by augmented assignment. Only Thomas Wouters <thomas@python.org> parents: 14146 diff changeset	1004
52fd496d3532 Support for the in-place operations introduced by augmented assignment. Only Thomas Wouters <thomas@python.org> parents: 14146 diff changeset	1005 */
52fd496d3532 Support for the in-place operations introduced by augmented assignment. Only Thomas Wouters <thomas@python.org> parents: 14146 diff changeset	1006
15721 ead8b5b994ad Massive changes as per PEP 208. Read it for details. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15029 diff changeset	1007 static PyObject *
26865 aaca8a3b23cd Always try nb_* slots before trying sq_concat, sq_inplace_concat, sq_repeat, Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 26622 diff changeset	1008 binary_iop1(PyObject v, PyObject w, const int iop_slot, const int op_slot)
14161 52fd496d3532 Support for the in-place operations introduced by augmented assignment. Only Thomas Wouters <thomas@python.org> parents: 14146 diff changeset	1009 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1010 PyNumberMethods *mv = v->ob_type->tp_as_number;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1011 if (mv != NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1012 binaryfunc slot = NB_BINOP(mv, iop_slot);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1013 if (slot) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1014 PyObject *x = (slot)(v, w);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1015 if (x != Py_NotImplemented) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1016 return x;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1017 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1018 Py_DECREF(x);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1019 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1020 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1021 return binary_op1(v, w, op_slot);
26865 aaca8a3b23cd Always try nb_* slots before trying sq_concat, sq_inplace_concat, sq_repeat, Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 26622 diff changeset	1022 }
aaca8a3b23cd Always try nb_* slots before trying sq_concat, sq_inplace_concat, sq_repeat, Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 26622 diff changeset	1023
aaca8a3b23cd Always try nb_* slots before trying sq_concat, sq_inplace_concat, sq_repeat, Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 26622 diff changeset	1024 static PyObject *
aaca8a3b23cd Always try nb_* slots before trying sq_concat, sq_inplace_concat, sq_repeat, Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 26622 diff changeset	1025 binary_iop(PyObject v, PyObject w, const int iop_slot, const int op_slot,
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1026 const char *op_name)
26865 aaca8a3b23cd Always try nb_* slots before trying sq_concat, sq_inplace_concat, sq_repeat, Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 26622 diff changeset	1027 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1028 PyObject *result = binary_iop1(v, w, iop_slot, op_slot);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1029 if (result == Py_NotImplemented) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1030 Py_DECREF(result);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1031 return binop_type_error(v, w, op_name);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1032 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1033 return result;
14161 52fd496d3532 Support for the in-place operations introduced by augmented assignment. Only Thomas Wouters <thomas@python.org> parents: 14146 diff changeset	1034 }
52fd496d3532 Support for the in-place operations introduced by augmented assignment. Only Thomas Wouters <thomas@python.org> parents: 14146 diff changeset	1035
15721 ead8b5b994ad Massive changes as per PEP 208. Read it for details. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15029 diff changeset	1036 #define INPLACE_BINOP(func, iop, op, op_name) \
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1037 PyObject * \
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1038 func(PyObject v, PyObject w) { \
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1039 return binary_iop(v, w, NB_SLOT(iop), NB_SLOT(op), op_name); \
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1040 }
14161 52fd496d3532 Support for the in-place operations introduced by augmented assignment. Only Thomas Wouters <thomas@python.org> parents: 14146 diff changeset	1041
15721 ead8b5b994ad Massive changes as per PEP 208. Read it for details. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15029 diff changeset	1042 INPLACE_BINOP(PyNumber_InPlaceOr, nb_inplace_or, nb_or, "\|=")
ead8b5b994ad Massive changes as per PEP 208. Read it for details. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15029 diff changeset	1043 INPLACE_BINOP(PyNumber_InPlaceXor, nb_inplace_xor, nb_xor, "^=")
ead8b5b994ad Massive changes as per PEP 208. Read it for details. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15029 diff changeset	1044 INPLACE_BINOP(PyNumber_InPlaceAnd, nb_inplace_and, nb_and, "&=")
ead8b5b994ad Massive changes as per PEP 208. Read it for details. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15029 diff changeset	1045 INPLACE_BINOP(PyNumber_InPlaceLshift, nb_inplace_lshift, nb_lshift, "<<=")
ead8b5b994ad Massive changes as per PEP 208. Read it for details. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15029 diff changeset	1046 INPLACE_BINOP(PyNumber_InPlaceRshift, nb_inplace_rshift, nb_rshift, ">>=")
ead8b5b994ad Massive changes as per PEP 208. Read it for details. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15029 diff changeset	1047 INPLACE_BINOP(PyNumber_InPlaceSubtract, nb_inplace_subtract, nb_subtract, "-=")
14161 52fd496d3532 Support for the in-place operations introduced by augmented assignment. Only Thomas Wouters <thomas@python.org> parents: 14146 diff changeset	1048
52fd496d3532 Support for the in-place operations introduced by augmented assignment. Only Thomas Wouters <thomas@python.org> parents: 14146 diff changeset	1049 PyObject *
19051 f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	1050 PyNumber_InPlaceFloorDivide(PyObject v, PyObject w)
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	1051 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1052 return binary_iop(v, w, NB_SLOT(nb_inplace_floor_divide),
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1053 NB_SLOT(nb_floor_divide), "//=");
19051 f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	1054 }
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	1055
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	1056 PyObject *
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	1057 PyNumber_InPlaceTrueDivide(PyObject v, PyObject w)
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	1058 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1059 return binary_iop(v, w, NB_SLOT(nb_inplace_true_divide),
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1060 NB_SLOT(nb_true_divide), "/=");
19051 f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	1061 }
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	1062
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	1063 PyObject *
14161 52fd496d3532 Support for the in-place operations introduced by augmented assignment. Only Thomas Wouters <thomas@python.org> parents: 14146 diff changeset	1064 PyNumber_InPlaceAdd(PyObject v, PyObject w)
52fd496d3532 Support for the in-place operations introduced by augmented assignment. Only Thomas Wouters <thomas@python.org> parents: 14146 diff changeset	1065 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1066 PyObject *result = binary_iop1(v, w, NB_SLOT(nb_inplace_add),
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1067 NB_SLOT(nb_add));
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1068 if (result == Py_NotImplemented) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1069 PySequenceMethods *m = v->ob_type->tp_as_sequence;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1070 Py_DECREF(result);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1071 if (m != NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1072 binaryfunc f = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1073 f = m->sq_inplace_concat;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1074 if (f == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1075 f = m->sq_concat;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1076 if (f != NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1077 return (*f)(v, w);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1078 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1079 result = binop_type_error(v, w, "+=");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1080 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1081 return result;
14161 52fd496d3532 Support for the in-place operations introduced by augmented assignment. Only Thomas Wouters <thomas@python.org> parents: 14146 diff changeset	1082 }
52fd496d3532 Support for the in-place operations introduced by augmented assignment. Only Thomas Wouters <thomas@python.org> parents: 14146 diff changeset	1083
52fd496d3532 Support for the in-place operations introduced by augmented assignment. Only Thomas Wouters <thomas@python.org> parents: 14146 diff changeset	1084 PyObject *
52fd496d3532 Support for the in-place operations introduced by augmented assignment. Only Thomas Wouters <thomas@python.org> parents: 14146 diff changeset	1085 PyNumber_InPlaceMultiply(PyObject v, PyObject w)
52fd496d3532 Support for the in-place operations introduced by augmented assignment. Only Thomas Wouters <thomas@python.org> parents: 14146 diff changeset	1086 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1087 PyObject *result = binary_iop1(v, w, NB_SLOT(nb_inplace_multiply),
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1088 NB_SLOT(nb_multiply));
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1089 if (result == Py_NotImplemented) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1090 ssizeargfunc f = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1091 PySequenceMethods *mv = v->ob_type->tp_as_sequence;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1092 PySequenceMethods *mw = w->ob_type->tp_as_sequence;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1093 Py_DECREF(result);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1094 if (mv != NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1095 f = mv->sq_inplace_repeat;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1096 if (f == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1097 f = mv->sq_repeat;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1098 if (f != NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1099 return sequence_repeat(f, v, w);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1100 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1101 else if (mw != NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1102 /* Note that the right hand operand should not be
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1103 * mutated in this case so sq_inplace_repeat is not
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1104 * used. */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1105 if (mw->sq_repeat)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1106 return sequence_repeat(mw->sq_repeat, w, v);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1107 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1108 result = binop_type_error(v, w, "*=");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1109 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1110 return result;
14161 52fd496d3532 Support for the in-place operations introduced by augmented assignment. Only Thomas Wouters <thomas@python.org> parents: 14146 diff changeset	1111 }
52fd496d3532 Support for the in-place operations introduced by augmented assignment. Only Thomas Wouters <thomas@python.org> parents: 14146 diff changeset	1112
52fd496d3532 Support for the in-place operations introduced by augmented assignment. Only Thomas Wouters <thomas@python.org> parents: 14146 diff changeset	1113 PyObject *
52fd496d3532 Support for the in-place operations introduced by augmented assignment. Only Thomas Wouters <thomas@python.org> parents: 14146 diff changeset	1114 PyNumber_InPlaceRemainder(PyObject v, PyObject w)
52fd496d3532 Support for the in-place operations introduced by augmented assignment. Only Thomas Wouters <thomas@python.org> parents: 14146 diff changeset	1115 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1116 return binary_iop(v, w, NB_SLOT(nb_inplace_remainder),
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1117 NB_SLOT(nb_remainder), "%=");
14161 52fd496d3532 Support for the in-place operations introduced by augmented assignment. Only Thomas Wouters <thomas@python.org> parents: 14146 diff changeset	1118 }
52fd496d3532 Support for the in-place operations introduced by augmented assignment. Only Thomas Wouters <thomas@python.org> parents: 14146 diff changeset	1119
52fd496d3532 Support for the in-place operations introduced by augmented assignment. Only Thomas Wouters <thomas@python.org> parents: 14146 diff changeset	1120 PyObject *
52fd496d3532 Support for the in-place operations introduced by augmented assignment. Only Thomas Wouters <thomas@python.org> parents: 14146 diff changeset	1121 PyNumber_InPlacePower(PyObject v, PyObject w, PyObject *z)
52fd496d3532 Support for the in-place operations introduced by augmented assignment. Only Thomas Wouters <thomas@python.org> parents: 14146 diff changeset	1122 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1123 if (v->ob_type->tp_as_number &&
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1124 v->ob_type->tp_as_number->nb_inplace_power != NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1125 return ternary_op(v, w, z, NB_SLOT(nb_inplace_power), "**=");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1126 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1127 else {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1128 return ternary_op(v, w, z, NB_SLOT(nb_power), "**=");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1129 }
14161 52fd496d3532 Support for the in-place operations introduced by augmented assignment. Only Thomas Wouters <thomas@python.org> parents: 14146 diff changeset	1130 }
52fd496d3532 Support for the in-place operations introduced by augmented assignment. Only Thomas Wouters <thomas@python.org> parents: 14146 diff changeset	1131
52fd496d3532 Support for the in-place operations introduced by augmented assignment. Only Thomas Wouters <thomas@python.org> parents: 14146 diff changeset	1132
8400 6270c6bad811 Completely reformatted, standardizing indentation as well as Guido van Rossum <guido@python.org> parents: 7854 diff changeset	1133 /* Unary operators and functions */
2840 d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	1134
d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	1135 PyObject *
13449 0409a98cd582 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	1136 PyNumber_Negative(PyObject *o)
2840 d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	1137 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1138 PyNumberMethods *m;
8400 6270c6bad811 Completely reformatted, standardizing indentation as well as Guido van Rossum <guido@python.org> parents: 7854 diff changeset	1139
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1140 if (o == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1141 return null_error();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1142 m = o->ob_type->tp_as_number;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1143 if (m && m->nb_negative)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1144 return (*m->nb_negative)(o);
8400 6270c6bad811 Completely reformatted, standardizing indentation as well as Guido van Rossum <guido@python.org> parents: 7854 diff changeset	1145
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1146 return type_error("bad operand type for unary -: '%.200s'", o);
2840 d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	1147 }
d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	1148
d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	1149 PyObject *
13449 0409a98cd582 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	1150 PyNumber_Positive(PyObject *o)
2840 d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	1151 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1152 PyNumberMethods *m;
8400 6270c6bad811 Completely reformatted, standardizing indentation as well as Guido van Rossum <guido@python.org> parents: 7854 diff changeset	1153
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1154 if (o == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1155 return null_error();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1156 m = o->ob_type->tp_as_number;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1157 if (m && m->nb_positive)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1158 return (*m->nb_positive)(o);
8400 6270c6bad811 Completely reformatted, standardizing indentation as well as Guido van Rossum <guido@python.org> parents: 7854 diff changeset	1159
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1160 return type_error("bad operand type for unary +: '%.200s'", o);
2840 d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	1161 }
d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	1162
d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	1163 PyObject *
13449 0409a98cd582 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	1164 PyNumber_Invert(PyObject *o)
2840 d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	1165 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1166 PyNumberMethods *m;
8400 6270c6bad811 Completely reformatted, standardizing indentation as well as Guido van Rossum <guido@python.org> parents: 7854 diff changeset	1167
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1168 if (o == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1169 return null_error();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1170 m = o->ob_type->tp_as_number;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1171 if (m && m->nb_invert)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1172 return (*m->nb_invert)(o);
8400 6270c6bad811 Completely reformatted, standardizing indentation as well as Guido van Rossum <guido@python.org> parents: 7854 diff changeset	1173
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1174 return type_error("bad operand type for unary ~: '%.200s'", o);
2840 d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	1175 }
d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	1176
d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	1177 PyObject *
13449 0409a98cd582 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	1178 PyNumber_Absolute(PyObject *o)
2840 d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	1179 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1180 PyNumberMethods *m;
2840 d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	1181
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1182 if (o == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1183 return null_error();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1184 m = o->ob_type->tp_as_number;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1185 if (m && m->nb_absolute)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1186 return m->nb_absolute(o);
2840 d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	1187
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1188 return type_error("bad operand type for abs(): '%.200s'", o);
2840 d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	1189 }
d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	1190
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43555 diff changeset	1191 /* Return a Python Int or Long from the object item
39610 3674f20ac781 Merge current trunk into p3yk. This includes the PyNumber_Index API change, Thomas Wouters <thomas@python.org> parents: 39603 diff changeset	1192 Raise TypeError if the result is not an int-or-long
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43555 diff changeset	1193 or if the object cannot be interpreted as an index.
39610 3674f20ac781 Merge current trunk into p3yk. This includes the PyNumber_Index API change, Thomas Wouters <thomas@python.org> parents: 39603 diff changeset	1194 */
3674f20ac781 Merge current trunk into p3yk. This includes the PyNumber_Index API change, Thomas Wouters <thomas@python.org> parents: 39603 diff changeset	1195 PyObject *
36882 6a9c7165b17b Checking in the code for PEP 357. Guido van Rossum <guido@python.org> parents: 36834 diff changeset	1196 PyNumber_Index(PyObject *item)
6a9c7165b17b Checking in the code for PEP 357. Guido van Rossum <guido@python.org> parents: 36834 diff changeset	1197 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1198 PyObject *result = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1199 if (item == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1200 return null_error();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1201 if (PyLong_Check(item)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1202 Py_INCREF(item);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1203 return item;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1204 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1205 if (PyIndex_Check(item)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1206 result = item->ob_type->tp_as_number->nb_index(item);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1207 if (result && !PyLong_Check(result)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1208 PyErr_Format(PyExc_TypeError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1209 "__index__ returned non-int "
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1210 "(type %.200s)",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1211 result->ob_type->tp_name);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1212 Py_DECREF(result);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1213 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1214 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1215 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1216 else {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1217 PyErr_Format(PyExc_TypeError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1218 "'%.200s' object cannot be interpreted "
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1219 "as an integer", item->ob_type->tp_name);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1220 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1221 return result;
36882 6a9c7165b17b Checking in the code for PEP 357. Guido van Rossum <guido@python.org> parents: 36834 diff changeset	1222 }
6a9c7165b17b Checking in the code for PEP 357. Guido van Rossum <guido@python.org> parents: 36834 diff changeset	1223
39610 3674f20ac781 Merge current trunk into p3yk. This includes the PyNumber_Index API change, Thomas Wouters <thomas@python.org> parents: 39603 diff changeset	1224 /* Return an error on Overflow only if err is not NULL*/
3674f20ac781 Merge current trunk into p3yk. This includes the PyNumber_Index API change, Thomas Wouters <thomas@python.org> parents: 39603 diff changeset	1225
3674f20ac781 Merge current trunk into p3yk. This includes the PyNumber_Index API change, Thomas Wouters <thomas@python.org> parents: 39603 diff changeset	1226 Py_ssize_t
3674f20ac781 Merge current trunk into p3yk. This includes the PyNumber_Index API change, Thomas Wouters <thomas@python.org> parents: 39603 diff changeset	1227 PyNumber_AsSsize_t(PyObject item, PyObject err)
3674f20ac781 Merge current trunk into p3yk. This includes the PyNumber_Index API change, Thomas Wouters <thomas@python.org> parents: 39603 diff changeset	1228 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1229 Py_ssize_t result;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1230 PyObject *runerr;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1231 PyObject *value = PyNumber_Index(item);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1232 if (value == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1233 return -1;
39610 3674f20ac781 Merge current trunk into p3yk. This includes the PyNumber_Index API change, Thomas Wouters <thomas@python.org> parents: 39603 diff changeset	1234
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1235 /* We're done if PyLong_AsSsize_t() returns without error. */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1236 result = PyLong_AsSsize_t(value);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1237 if (result != -1 \|\| !(runerr = PyErr_Occurred()))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1238 goto finish;
39610 3674f20ac781 Merge current trunk into p3yk. This includes the PyNumber_Index API change, Thomas Wouters <thomas@python.org> parents: 39603 diff changeset	1239
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1240 /* Error handling code -- only manage OverflowError differently */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1241 if (!PyErr_GivenExceptionMatches(runerr, PyExc_OverflowError))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1242 goto finish;
39610 3674f20ac781 Merge current trunk into p3yk. This includes the PyNumber_Index API change, Thomas Wouters <thomas@python.org> parents: 39603 diff changeset	1243
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1244 PyErr_Clear();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1245 /* If no error-handling desired then the default clipping
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1246 is sufficient.
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1247 */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1248 if (!err) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1249 assert(PyLong_Check(value));
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1250 /* Whether or not it is less than or equal to
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1251 zero is determined by the sign of ob_size
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1252 */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1253 if (_PyLong_Sign(value) < 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1254 result = PY_SSIZE_T_MIN;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1255 else
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1256 result = PY_SSIZE_T_MAX;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1257 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1258 else {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1259 /* Otherwise replace the error with caller's error object. */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1260 PyErr_Format(err,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1261 "cannot fit '%.200s' into an index-sized integer",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1262 item->ob_type->tp_name);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1263 }
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43555 diff changeset	1264
39610 3674f20ac781 Merge current trunk into p3yk. This includes the PyNumber_Index API change, Thomas Wouters <thomas@python.org> parents: 39603 diff changeset	1265 finish:
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1266 Py_DECREF(value);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1267 return result;
39610 3674f20ac781 Merge current trunk into p3yk. This includes the PyNumber_Index API change, Thomas Wouters <thomas@python.org> parents: 39603 diff changeset	1268 }
3674f20ac781 Merge current trunk into p3yk. This includes the PyNumber_Index API change, Thomas Wouters <thomas@python.org> parents: 39603 diff changeset	1269
3674f20ac781 Merge current trunk into p3yk. This includes the PyNumber_Index API change, Thomas Wouters <thomas@python.org> parents: 39603 diff changeset	1270
45145 3d7b84daa34a Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552-60567 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45029 diff changeset	1271 PyObject *
3d7b84daa34a Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552-60567 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45029 diff changeset	1272 _PyNumber_ConvertIntegralToInt(PyObject integral, const char error_format)
3d7b84daa34a Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552-60567 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45029 diff changeset	1273 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1274 static PyObject *int_name = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1275 if (int_name == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1276 int_name = PyUnicode_InternFromString("__int__");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1277 if (int_name == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1278 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1279 }
45145 3d7b84daa34a Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552-60567 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45029 diff changeset	1280
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1281 if (integral && !PyLong_Check(integral)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1282 /* Don't go through tp_as_number->nb_int to avoid
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1283 hitting the classic class fallback to __trunc__. */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1284 PyObject *int_func = PyObject_GetAttr(integral, int_name);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1285 if (int_func == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1286 PyErr_Clear(); /* Raise a different error. */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1287 goto non_integral_error;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1288 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1289 Py_DECREF(integral);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1290 integral = PyEval_CallObject(int_func, NULL);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1291 Py_DECREF(int_func);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1292 if (integral && !PyLong_Check(integral)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1293 goto non_integral_error;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1294 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1295 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1296 return integral;
45145 3d7b84daa34a Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552-60567 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45029 diff changeset	1297
3d7b84daa34a Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552-60567 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45029 diff changeset	1298 non_integral_error:
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1299 PyErr_Format(PyExc_TypeError, error_format, Py_TYPE(integral)->tp_name);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1300 Py_DECREF(integral);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1301 return NULL;
45145 3d7b84daa34a Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552-60567 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45029 diff changeset	1302 }
3d7b84daa34a Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552-60567 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45029 diff changeset	1303
3d7b84daa34a Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552-60567 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45029 diff changeset	1304
12248 70154e2e9c89 Marc-Andre's third try at this bulk patch seems to work (except that Guido van Rossum <guido@python.org> parents: 11969 diff changeset	1305 /* Add a check for embedded NULL-bytes in the argument. */
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 9834 diff changeset	1306 static PyObject *
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36484 diff changeset	1307 long_from_string(const char *s, Py_ssize_t len)
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 9834 diff changeset	1308 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1309 char *end;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1310 PyObject *x;
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 9834 diff changeset	1311
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1312 x = PyLong_FromString((char*)s, &end, 10);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1313 if (x == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1314 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1315 if (end != s + len) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1316 PyErr_SetString(PyExc_ValueError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1317 "null byte in argument for int()");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1318 Py_DECREF(x);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1319 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1320 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1321 return x;
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 9834 diff changeset	1322 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 9834 diff changeset	1323
2840 d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	1324 PyObject *
13449 0409a98cd582 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	1325 PyNumber_Long(PyObject *o)
2840 d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	1326 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1327 PyNumberMethods *m;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1328 static PyObject *trunc_name = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1329 PyObject *trunc_func;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1330 const char *buffer;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1331 Py_ssize_t buffer_len;
2840 d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	1332
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1333 if (trunc_name == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1334 trunc_name = PyUnicode_InternFromString("__trunc__");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1335 if (trunc_name == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1336 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1337 }
45145 3d7b84daa34a Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552-60567 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45029 diff changeset	1338
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1339 if (o == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1340 return null_error();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1341 if (PyLong_CheckExact(o)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1342 Py_INCREF(o);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1343 return o;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1344 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1345 m = o->ob_type->tp_as_number;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1346 if (m && m->nb_int) { /* This should include subclasses of int */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1347 PyObject *res = m->nb_int(o);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1348 if (res && !PyLong_Check(res)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1349 PyErr_Format(PyExc_TypeError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1350 "__int__ returned non-int (type %.200s)",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1351 res->ob_type->tp_name);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1352 Py_DECREF(res);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1353 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1354 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1355 return res;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1356 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1357 if (PyLong_Check(o)) /* An int subclass without nb_int */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1358 return _PyLong_Copy((PyLongObject *)o);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1359 trunc_func = PyObject_GetAttr(o, trunc_name);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1360 if (trunc_func) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1361 PyObject *truncated = PyEval_CallObject(trunc_func, NULL);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1362 PyObject *int_instance;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1363 Py_DECREF(trunc_func);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1364 /* __trunc__ is specified to return an Integral type,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1365 but long() needs to return a long. */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1366 int_instance = _PyNumber_ConvertIntegralToInt(
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1367 truncated,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1368 "__trunc__ returned non-Integral (type %.200s)");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1369 return int_instance;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1370 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1371 PyErr_Clear(); /* It's not an error if o.__trunc__ doesn't exist. */
45145 3d7b84daa34a Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552-60567 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45029 diff changeset	1372
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1373 if (PyBytes_Check(o))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1374 /* need to do extra error checking that PyLong_FromString()
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1375 * doesn't do. In particular long('9.5') must raise an
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1376 * exception, not truncate the float.
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1377 */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1378 return long_from_string(PyBytes_AS_STRING(o),
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1379 PyBytes_GET_SIZE(o));
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1380 if (PyUnicode_Check(o))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1381 /* The above check is done in PyLong_FromUnicode(). */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1382 return PyLong_FromUnicode(PyUnicode_AS_UNICODE(o),
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1383 PyUnicode_GET_SIZE(o),
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1384 10);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1385 if (!PyObject_AsCharBuffer(o, &buffer, &buffer_len))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1386 return long_from_string(buffer, buffer_len);
2840 d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	1387
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1388 return type_error("int() argument must be a string or a "
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1389 "number, not '%.200s'", o);
2840 d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	1390 }
d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	1391
d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	1392 PyObject *
13449 0409a98cd582 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	1393 PyNumber_Float(PyObject *o)
2840 d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	1394 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1395 PyNumberMethods *m;
2840 d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	1396
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1397 if (o == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1398 return null_error();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1399 m = o->ob_type->tp_as_number;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1400 if (m && m->nb_float) { /* This should include subclasses of float */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1401 PyObject *res = m->nb_float(o);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1402 if (res && !PyFloat_Check(res)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1403 PyErr_Format(PyExc_TypeError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1404 "__float__ returned non-float (type %.200s)",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1405 res->ob_type->tp_name);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1406 Py_DECREF(res);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1407 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1408 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1409 return res;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1410 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1411 if (PyFloat_Check(o)) { /* A float subclass with nb_float == NULL */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1412 PyFloatObject po = (PyFloatObject )o;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1413 return PyFloat_FromDouble(po->ob_fval);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1414 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1415 return PyFloat_FromString(o);
2840 d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	1416 }
d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	1417
42084 229c28cb9afb Merged revisions 55817-55961 via svnmerge from Guido van Rossum <guido@python.org> parents: 42013 diff changeset	1418
229c28cb9afb Merged revisions 55817-55961 via svnmerge from Guido van Rossum <guido@python.org> parents: 42013 diff changeset	1419 PyObject *
229c28cb9afb Merged revisions 55817-55961 via svnmerge from Guido van Rossum <guido@python.org> parents: 42013 diff changeset	1420 PyNumber_ToBase(PyObject *n, int base)
229c28cb9afb Merged revisions 55817-55961 via svnmerge from Guido van Rossum <guido@python.org> parents: 42013 diff changeset	1421 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1422 PyObject *res = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1423 PyObject *index = PyNumber_Index(n);
48364 7788e9893b85 Revert 64451. Raymond Hettinger <python@rcn.com> parents: 48353 diff changeset	1424
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1425 if (!index)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1426 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1427 if (PyLong_Check(index))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1428 res = _PyLong_Format(index, base);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1429 else
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1430 /* It should not be possible to get here, as
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1431 PyNumber_Index already has a check for the same
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1432 condition */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1433 PyErr_SetString(PyExc_ValueError, "PyNumber_ToBase: index not "
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1434 "int or long");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1435 Py_DECREF(index);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1436 return res;
42084 229c28cb9afb Merged revisions 55817-55961 via svnmerge from Guido van Rossum <guido@python.org> parents: 42013 diff changeset	1437 }
229c28cb9afb Merged revisions 55817-55961 via svnmerge from Guido van Rossum <guido@python.org> parents: 42013 diff changeset	1438
229c28cb9afb Merged revisions 55817-55961 via svnmerge from Guido van Rossum <guido@python.org> parents: 42013 diff changeset	1439
8400 6270c6bad811 Completely reformatted, standardizing indentation as well as Guido van Rossum <guido@python.org> parents: 7854 diff changeset	1440 /* Operations on sequences */
2840 d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	1441
8400 6270c6bad811 Completely reformatted, standardizing indentation as well as Guido van Rossum <guido@python.org> parents: 7854 diff changeset	1442 int
13449 0409a98cd582 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	1443 PySequence_Check(PyObject *s)
2840 d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	1444 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59631 diff changeset	1445 if (PyDict_Check(s))
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1446 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1447 return s != NULL && s->ob_type->tp_as_sequence &&
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1448 s->ob_type->tp_as_sequence->sq_item != NULL;
2840 d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	1449 }
d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	1450
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36484 diff changeset	1451 Py_ssize_t
13575 7c119f050290 change abstract size functions PySequence_Size &c. Jeremy Hylton <jeremy@alum.mit.edu> parents: 13451 diff changeset	1452 PySequence_Size(PyObject *s)
2840 d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	1453 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1454 PySequenceMethods *m;
2840 d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	1455
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1456 if (s == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1457 null_error();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1458 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1459 }
2840 d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	1460
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1461 m = s->ob_type->tp_as_sequence;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1462 if (m && m->sq_length)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1463 return m->sq_length(s);
2840 d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	1464
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1465 type_error("object of type '%.200s' has no len()", s);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1466 return -1;
2840 d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	1467 }
d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	1468
13634 6f0d96e6b5a5 Restore PyXXX_Length() APIs for binary compatibility. Marc-André Lemburg <mal@egenix.com> parents: 13575 diff changeset	1469 #undef PySequence_Length
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36484 diff changeset	1470 Py_ssize_t
13634 6f0d96e6b5a5 Restore PyXXX_Length() APIs for binary compatibility. Marc-André Lemburg <mal@egenix.com> parents: 13575 diff changeset	1471 PySequence_Length(PyObject *s)
6f0d96e6b5a5 Restore PyXXX_Length() APIs for binary compatibility. Marc-André Lemburg <mal@egenix.com> parents: 13575 diff changeset	1472 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1473 return PySequence_Size(s);
13634 6f0d96e6b5a5 Restore PyXXX_Length() APIs for binary compatibility. Marc-André Lemburg <mal@egenix.com> parents: 13575 diff changeset	1474 }
6f0d96e6b5a5 Restore PyXXX_Length() APIs for binary compatibility. Marc-André Lemburg <mal@egenix.com> parents: 13575 diff changeset	1475 #define PySequence_Length PySequence_Size
6f0d96e6b5a5 Restore PyXXX_Length() APIs for binary compatibility. Marc-André Lemburg <mal@egenix.com> parents: 13575 diff changeset	1476
2840 d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	1477 PyObject *
13449 0409a98cd582 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	1478 PySequence_Concat(PyObject s, PyObject o)
2840 d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	1479 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1480 PySequenceMethods *m;
2840 d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	1481
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1482 if (s == NULL \|\| o == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1483 return null_error();
2840 d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	1484
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1485 m = s->ob_type->tp_as_sequence;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1486 if (m && m->sq_concat)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1487 return m->sq_concat(s, o);
8400 6270c6bad811 Completely reformatted, standardizing indentation as well as Guido van Rossum <guido@python.org> parents: 7854 diff changeset	1488
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1489 /* Instances of user classes defining an __add__() method only
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1490 have an nb_add slot, not an sq_concat slot. So we fall back
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1491 to nb_add if both arguments appear to be sequences. */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1492 if (PySequence_Check(s) && PySequence_Check(o)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1493 PyObject *result = binary_op1(s, o, NB_SLOT(nb_add));
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1494 if (result != Py_NotImplemented)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1495 return result;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1496 Py_DECREF(result);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1497 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1498 return type_error("'%.200s' object can't be concatenated", s);
2840 d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	1499 }
d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	1500
d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	1501 PyObject *
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36484 diff changeset	1502 PySequence_Repeat(PyObject *o, Py_ssize_t count)
2840 d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	1503 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1504 PySequenceMethods *m;
2840 d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	1505
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1506 if (o == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1507 return null_error();
2840 d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	1508
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1509 m = o->ob_type->tp_as_sequence;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1510 if (m && m->sq_repeat)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1511 return m->sq_repeat(o, count);
8400 6270c6bad811 Completely reformatted, standardizing indentation as well as Guido van Rossum <guido@python.org> parents: 7854 diff changeset	1512
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1513 /* Instances of user classes defining a __mul__() method only
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1514 have an nb_multiply slot, not an sq_repeat slot. so we fall back
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1515 to nb_multiply if o appears to be a sequence. */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1516 if (PySequence_Check(o)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1517 PyObject n, result;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1518 n = PyLong_FromSsize_t(count);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1519 if (n == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1520 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1521 result = binary_op1(o, n, NB_SLOT(nb_multiply));
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1522 Py_DECREF(n);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1523 if (result != Py_NotImplemented)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1524 return result;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1525 Py_DECREF(result);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1526 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1527 return type_error("'%.200s' object can't be repeated", o);
2840 d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	1528 }
d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	1529
d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	1530 PyObject *
14161 52fd496d3532 Support for the in-place operations introduced by augmented assignment. Only Thomas Wouters <thomas@python.org> parents: 14146 diff changeset	1531 PySequence_InPlaceConcat(PyObject s, PyObject o)
52fd496d3532 Support for the in-place operations introduced by augmented assignment. Only Thomas Wouters <thomas@python.org> parents: 14146 diff changeset	1532 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1533 PySequenceMethods *m;
14161 52fd496d3532 Support for the in-place operations introduced by augmented assignment. Only Thomas Wouters <thomas@python.org> parents: 14146 diff changeset	1534
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1535 if (s == NULL \|\| o == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1536 return null_error();
14161 52fd496d3532 Support for the in-place operations introduced by augmented assignment. Only Thomas Wouters <thomas@python.org> parents: 14146 diff changeset	1537
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1538 m = s->ob_type->tp_as_sequence;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1539 if (m && m->sq_inplace_concat)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1540 return m->sq_inplace_concat(s, o);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1541 if (m && m->sq_concat)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1542 return m->sq_concat(s, o);
14161 52fd496d3532 Support for the in-place operations introduced by augmented assignment. Only Thomas Wouters <thomas@python.org> parents: 14146 diff changeset	1543
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1544 if (PySequence_Check(s) && PySequence_Check(o)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1545 PyObject *result = binary_iop1(s, o, NB_SLOT(nb_inplace_add),
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1546 NB_SLOT(nb_add));
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1547 if (result != Py_NotImplemented)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1548 return result;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1549 Py_DECREF(result);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1550 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1551 return type_error("'%.200s' object can't be concatenated", s);
14161 52fd496d3532 Support for the in-place operations introduced by augmented assignment. Only Thomas Wouters <thomas@python.org> parents: 14146 diff changeset	1552 }
52fd496d3532 Support for the in-place operations introduced by augmented assignment. Only Thomas Wouters <thomas@python.org> parents: 14146 diff changeset	1553
52fd496d3532 Support for the in-place operations introduced by augmented assignment. Only Thomas Wouters <thomas@python.org> parents: 14146 diff changeset	1554 PyObject *
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36484 diff changeset	1555 PySequence_InPlaceRepeat(PyObject *o, Py_ssize_t count)
14161 52fd496d3532 Support for the in-place operations introduced by augmented assignment. Only Thomas Wouters <thomas@python.org> parents: 14146 diff changeset	1556 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1557 PySequenceMethods *m;
14161 52fd496d3532 Support for the in-place operations introduced by augmented assignment. Only Thomas Wouters <thomas@python.org> parents: 14146 diff changeset	1558
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1559 if (o == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1560 return null_error();
14161 52fd496d3532 Support for the in-place operations introduced by augmented assignment. Only Thomas Wouters <thomas@python.org> parents: 14146 diff changeset	1561
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1562 m = o->ob_type->tp_as_sequence;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1563 if (m && m->sq_inplace_repeat)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1564 return m->sq_inplace_repeat(o, count);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1565 if (m && m->sq_repeat)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1566 return m->sq_repeat(o, count);
14161 52fd496d3532 Support for the in-place operations introduced by augmented assignment. Only Thomas Wouters <thomas@python.org> parents: 14146 diff changeset	1567
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1568 if (PySequence_Check(o)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1569 PyObject n, result;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1570 n = PyLong_FromSsize_t(count);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1571 if (n == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1572 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1573 result = binary_iop1(o, n, NB_SLOT(nb_inplace_multiply),
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1574 NB_SLOT(nb_multiply));
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1575 Py_DECREF(n);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1576 if (result != Py_NotImplemented)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1577 return result;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1578 Py_DECREF(result);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1579 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1580 return type_error("'%.200s' object can't be repeated", o);
14161 52fd496d3532 Support for the in-place operations introduced by augmented assignment. Only Thomas Wouters <thomas@python.org> parents: 14146 diff changeset	1581 }
52fd496d3532 Support for the in-place operations introduced by augmented assignment. Only Thomas Wouters <thomas@python.org> parents: 14146 diff changeset	1582
52fd496d3532 Support for the in-place operations introduced by augmented assignment. Only Thomas Wouters <thomas@python.org> parents: 14146 diff changeset	1583 PyObject *
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36484 diff changeset	1584 PySequence_GetItem(PyObject *s, Py_ssize_t i)
2840 d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	1585 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1586 PySequenceMethods *m;
2840 d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	1587
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1588 if (s == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1589 return null_error();
2840 d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	1590
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1591 m = s->ob_type->tp_as_sequence;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1592 if (m && m->sq_item) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1593 if (i < 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1594 if (m->sq_length) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1595 Py_ssize_t l = (*m->sq_length)(s);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1596 if (l < 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1597 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1598 i += l;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1599 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1600 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1601 return m->sq_item(s, i);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1602 }
2840 d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	1603
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1604 return type_error("'%.200s' object does not support indexing", s);
2840 d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	1605 }
d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	1606
d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	1607 PyObject *
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36484 diff changeset	1608 PySequence_GetSlice(PyObject *s, Py_ssize_t i1, Py_ssize_t i2)
2840 d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	1609 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1610 PyMappingMethods *mp;
2840 d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	1611
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1612 if (!s) return null_error();
2840 d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	1613
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1614 mp = s->ob_type->tp_as_mapping;
64651 8f81ed8acbb0 Merged revisions 84714 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 64344 diff changeset	1615 if (mp && mp->mp_subscript) {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1616 PyObject *res;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1617 PyObject *slice = _PySlice_FromIndices(i1, i2);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1618 if (!slice)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1619 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1620 res = mp->mp_subscript(s, slice);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1621 Py_DECREF(slice);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1622 return res;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1623 }
2840 d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	1624
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1625 return type_error("'%.200s' object is unsliceable", s);
2840 d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	1626 }
d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	1627
d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	1628 int
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36484 diff changeset	1629 PySequence_SetItem(PyObject s, Py_ssize_t i, PyObject o)
2840 d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	1630 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1631 PySequenceMethods *m;
8400 6270c6bad811 Completely reformatted, standardizing indentation as well as Guido van Rossum <guido@python.org> parents: 7854 diff changeset	1632
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1633 if (s == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1634 null_error();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1635 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1636 }
2840 d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	1637
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1638 m = s->ob_type->tp_as_sequence;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1639 if (m && m->sq_ass_item) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1640 if (i < 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1641 if (m->sq_length) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1642 Py_ssize_t l = (*m->sq_length)(s);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1643 if (l < 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1644 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1645 i += l;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1646 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1647 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1648 return m->sq_ass_item(s, i, o);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1649 }
2840 d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	1650
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1651 type_error("'%.200s' object does not support item assignment", s);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1652 return -1;
2840 d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	1653 }
d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	1654
4090 0b40c8d5b21d Added PyObject_DelItem and PySequence_Del{Item,Slice}. Guido van Rossum <guido@python.org> parents: 3097 diff changeset	1655 int
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36484 diff changeset	1656 PySequence_DelItem(PyObject *s, Py_ssize_t i)
4090 0b40c8d5b21d Added PyObject_DelItem and PySequence_Del{Item,Slice}. Guido van Rossum <guido@python.org> parents: 3097 diff changeset	1657 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1658 PySequenceMethods *m;
8400 6270c6bad811 Completely reformatted, standardizing indentation as well as Guido van Rossum <guido@python.org> parents: 7854 diff changeset	1659
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1660 if (s == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1661 null_error();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1662 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1663 }
4090 0b40c8d5b21d Added PyObject_DelItem and PySequence_Del{Item,Slice}. Guido van Rossum <guido@python.org> parents: 3097 diff changeset	1664
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1665 m = s->ob_type->tp_as_sequence;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1666 if (m && m->sq_ass_item) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1667 if (i < 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1668 if (m->sq_length) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1669 Py_ssize_t l = (*m->sq_length)(s);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1670 if (l < 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1671 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1672 i += l;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1673 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1674 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1675 return m->sq_ass_item(s, i, (PyObject *)NULL);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1676 }
4090 0b40c8d5b21d Added PyObject_DelItem and PySequence_Del{Item,Slice}. Guido van Rossum <guido@python.org> parents: 3097 diff changeset	1677
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1678 type_error("'%.200s' object doesn't support item deletion", s);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1679 return -1;
4090 0b40c8d5b21d Added PyObject_DelItem and PySequence_Del{Item,Slice}. Guido van Rossum <guido@python.org> parents: 3097 diff changeset	1680 }
0b40c8d5b21d Added PyObject_DelItem and PySequence_Del{Item,Slice}. Guido van Rossum <guido@python.org> parents: 3097 diff changeset	1681
8400 6270c6bad811 Completely reformatted, standardizing indentation as well as Guido van Rossum <guido@python.org> parents: 7854 diff changeset	1682 int
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36484 diff changeset	1683 PySequence_SetSlice(PyObject s, Py_ssize_t i1, Py_ssize_t i2, PyObject o)
2840 d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	1684 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1685 PyMappingMethods *mp;
8400 6270c6bad811 Completely reformatted, standardizing indentation as well as Guido van Rossum <guido@python.org> parents: 7854 diff changeset	1686
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1687 if (s == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1688 null_error();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1689 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1690 }
2840 d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	1691
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1692 mp = s->ob_type->tp_as_mapping;
64651 8f81ed8acbb0 Merged revisions 84714 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 64344 diff changeset	1693 if (mp && mp->mp_ass_subscript) {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1694 int res;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1695 PyObject *slice = _PySlice_FromIndices(i1, i2);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1696 if (!slice)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1697 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1698 res = mp->mp_ass_subscript(s, slice, o);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1699 Py_DECREF(slice);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1700 return res;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1701 }
14037 91f847a783d2 Apply SF patch #101029: call __getitem__ with a proper slice object if there Thomas Wouters <thomas@python.org> parents: 13830 diff changeset	1702
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1703 type_error("'%.200s' object doesn't support slice assignment", s);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1704 return -1;
2840 d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	1705 }
d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	1706
8400 6270c6bad811 Completely reformatted, standardizing indentation as well as Guido van Rossum <guido@python.org> parents: 7854 diff changeset	1707 int
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36484 diff changeset	1708 PySequence_DelSlice(PyObject *s, Py_ssize_t i1, Py_ssize_t i2)
4090 0b40c8d5b21d Added PyObject_DelItem and PySequence_Del{Item,Slice}. Guido van Rossum <guido@python.org> parents: 3097 diff changeset	1709 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1710 PyMappingMethods *mp;
8400 6270c6bad811 Completely reformatted, standardizing indentation as well as Guido van Rossum <guido@python.org> parents: 7854 diff changeset	1711
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1712 if (s == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1713 null_error();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1714 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1715 }
4090 0b40c8d5b21d Added PyObject_DelItem and PySequence_Del{Item,Slice}. Guido van Rossum <guido@python.org> parents: 3097 diff changeset	1716
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1717 mp = s->ob_type->tp_as_mapping;
64651 8f81ed8acbb0 Merged revisions 84714 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 64344 diff changeset	1718 if (mp && mp->mp_ass_subscript) {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1719 int res;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1720 PyObject *slice = _PySlice_FromIndices(i1, i2);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1721 if (!slice)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1722 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1723 res = mp->mp_ass_subscript(s, slice, NULL);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1724 Py_DECREF(slice);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1725 return res;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1726 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1727 type_error("'%.200s' object doesn't support slice deletion", s);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1728 return -1;
4090 0b40c8d5b21d Added PyObject_DelItem and PySequence_Del{Item,Slice}. Guido van Rossum <guido@python.org> parents: 3097 diff changeset	1729 }
0b40c8d5b21d Added PyObject_DelItem and PySequence_Del{Item,Slice}. Guido van Rossum <guido@python.org> parents: 3097 diff changeset	1730
2840 d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	1731 PyObject *
13449 0409a98cd582 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	1732 PySequence_Tuple(PyObject *v)
2840 d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	1733 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1734 PyObject it; / iter(v) */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1735 Py_ssize_t n; /* guess for result tuple size */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1736 PyObject *result = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1737 Py_ssize_t j;
8400 6270c6bad811 Completely reformatted, standardizing indentation as well as Guido van Rossum <guido@python.org> parents: 7854 diff changeset	1738
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1739 if (v == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1740 return null_error();
2840 d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	1741
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1742 /* Special-case the common tuple and list cases, for efficiency. */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1743 if (PyTuple_CheckExact(v)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1744 /* Note that we can't know whether it's safe to return
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1745 a tuple subclass instance as-is, hence the restriction
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1746 to exact tuples here. In contrast, lists always make
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1747 a copy, so there's no need for exactness below. */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1748 Py_INCREF(v);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1749 return v;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1750 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1751 if (PyList_Check(v))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1752 return PyList_AsTuple(v);
2840 d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	1753
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1754 /* Get iterator. */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1755 it = PyObject_GetIter(v);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1756 if (it == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1757 return NULL;
17684 399d99601b2d Generalize tuple() to work nicely with iterators. Tim Peters <tim.peters@gmail.com> parents: 17683 diff changeset	1758
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1759 /* Guess result size and allocate space. */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1760 n = _PyObject_LengthHint(v, 10);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1761 if (n == -1)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1762 goto Fail;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1763 result = PyTuple_New(n);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1764 if (result == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1765 goto Fail;
8400 6270c6bad811 Completely reformatted, standardizing indentation as well as Guido van Rossum <guido@python.org> parents: 7854 diff changeset	1766
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1767 /* Fill the tuple. */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1768 for (j = 0; ; ++j) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1769 PyObject *item = PyIter_Next(it);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1770 if (item == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1771 if (PyErr_Occurred())
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1772 goto Fail;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1773 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1774 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1775 if (j >= n) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1776 Py_ssize_t oldn = n;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1777 /* The over-allocation strategy can grow a bit faster
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1778 than for lists because unlike lists the
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1779 over-allocation isn't permanent -- we reclaim
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1780 the excess before the end of this routine.
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1781 So, grow by ten and then add 25%.
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1782 */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1783 n += 10;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1784 n += n >> 2;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1785 if (n < oldn) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1786 /* Check for overflow */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1787 PyErr_NoMemory();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1788 Py_DECREF(item);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1789 goto Fail;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1790 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1791 if (_PyTuple_Resize(&result, n) != 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1792 Py_DECREF(item);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1793 goto Fail;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1794 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1795 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1796 PyTuple_SET_ITEM(result, j, item);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1797 }
8400 6270c6bad811 Completely reformatted, standardizing indentation as well as Guido van Rossum <guido@python.org> parents: 7854 diff changeset	1798
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1799 /* Cut tuple back if guess was too large. */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1800 if (j < n &&
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1801 _PyTuple_Resize(&result, j) != 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1802 goto Fail;
17684 399d99601b2d Generalize tuple() to work nicely with iterators. Tim Peters <tim.peters@gmail.com> parents: 17683 diff changeset	1803
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1804 Py_DECREF(it);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1805 return result;
17684 399d99601b2d Generalize tuple() to work nicely with iterators. Tim Peters <tim.peters@gmail.com> parents: 17683 diff changeset	1806
399d99601b2d Generalize tuple() to work nicely with iterators. Tim Peters <tim.peters@gmail.com> parents: 17683 diff changeset	1807 Fail:
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1808 Py_XDECREF(result);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1809 Py_DECREF(it);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1810 return NULL;
2840 d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	1811 }
d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	1812
4582 2f8d9c22de62 Added missing PySequence_List. Guido van Rossum <guido@python.org> parents: 4529 diff changeset	1813 PyObject *
13449 0409a98cd582 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	1814 PySequence_List(PyObject *v)
4582 2f8d9c22de62 Added missing PySequence_List. Guido van Rossum <guido@python.org> parents: 4529 diff changeset	1815 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1816 PyObject result; / result list */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1817 PyObject rv; / return value from PyList_Extend */
5235 4f1fa7b69ba7 Several fixes reported by jim F. Guido van Rossum <guido@python.org> parents: 4771 diff changeset	1818
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1819 if (v == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1820 return null_error();
8662 74f385ee44cb Add special case to PySequence_List() so that list() of a list is Guido van Rossum <guido@python.org> parents: 8660 diff changeset	1821
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1822 result = PyList_New(0);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1823 if (result == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1824 return NULL;
17648 6c82277e77f3 Generalize list(seq) to work with iterators. This also generalizes list() Tim Peters <tim.peters@gmail.com> parents: 17617 diff changeset	1825
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1826 rv = _PyList_Extend((PyListObject *)result, v);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1827 if (rv == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1828 Py_DECREF(result);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1829 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1830 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1831 Py_DECREF(rv);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1832 return result;
4582 2f8d9c22de62 Added missing PySequence_List. Guido van Rossum <guido@python.org> parents: 4529 diff changeset	1833 }
2f8d9c22de62 Added missing PySequence_List. Guido van Rossum <guido@python.org> parents: 4529 diff changeset	1834
12952 51949de76365 Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12248 diff changeset	1835 PyObject *
13449 0409a98cd582 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	1836 PySequence_Fast(PyObject v, const char m)
12952 51949de76365 Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12248 diff changeset	1837 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1838 PyObject *it;
31370 a6284e9f30a2 SF Patch #871704: Py_SequenceFast can mask errors Raymond Hettinger <python@rcn.com> parents: 31345 diff changeset	1839
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1840 if (v == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1841 return null_error();
12952 51949de76365 Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12248 diff changeset	1842
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1843 if (PyList_CheckExact(v) \|\| PyTuple_CheckExact(v)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1844 Py_INCREF(v);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1845 return v;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1846 }
12952 51949de76365 Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12248 diff changeset	1847
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1848 it = PyObject_GetIter(v);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1849 if (it == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1850 if (PyErr_ExceptionMatches(PyExc_TypeError))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1851 PyErr_SetString(PyExc_TypeError, m);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1852 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1853 }
31370 a6284e9f30a2 SF Patch #871704: Py_SequenceFast can mask errors Raymond Hettinger <python@rcn.com> parents: 31345 diff changeset	1854
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1855 v = PySequence_List(it);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1856 Py_DECREF(it);
12952 51949de76365 Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12248 diff changeset	1857
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1858 return v;
12952 51949de76365 Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12248 diff changeset	1859 }
51949de76365 Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12248 diff changeset	1860
19808 0584c9132525 Generalize operator.indexOf (PySequence_Index) to work with any Tim Peters <tim.peters@gmail.com> parents: 19804 diff changeset	1861 /* Iterate over seq. Result depends on the operation:
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1862 PY_ITERSEARCH_COUNT: -1 if error, else # of times obj appears in seq.
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1863 PY_ITERSEARCH_INDEX: 0-based index of first occurrence of obj in seq;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1864 set ValueError and return -1 if none found; also return -1 on error.
19808 0584c9132525 Generalize operator.indexOf (PySequence_Index) to work with any Tim Peters <tim.peters@gmail.com> parents: 19804 diff changeset	1865 Py_ITERSEARCH_CONTAINS: return 1 if obj in seq, else 0; -1 on error.
0584c9132525 Generalize operator.indexOf (PySequence_Index) to work with any Tim Peters <tim.peters@gmail.com> parents: 19804 diff changeset	1866 */
36834 0b7809660456 Change some sequnce APIs to use Py_ssize_t. Neal Norwitz <nnorwitz@gmail.com> parents: 36675 diff changeset	1867 Py_ssize_t
19808 0584c9132525 Generalize operator.indexOf (PySequence_Index) to work with any Tim Peters <tim.peters@gmail.com> parents: 19804 diff changeset	1868 _PySequence_IterSearch(PyObject seq, PyObject obj, int operation)
2840 d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	1869 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1870 Py_ssize_t n;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1871 int wrapped; /* for PY_ITERSEARCH_INDEX, true iff n wrapped around */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1872 PyObject it; / iter(seq) */
2840 d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	1873
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1874 if (seq == NULL \|\| obj == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1875 null_error();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1876 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1877 }
17690 ee4d17862b61 Generalize PySequence_Count() (operator.countOf) to work with iterators. Tim Peters <tim.peters@gmail.com> parents: 17688 diff changeset	1878
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1879 it = PyObject_GetIter(seq);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1880 if (it == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1881 type_error("argument of type '%.200s' is not iterable", seq);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1882 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1883 }
2840 d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	1884
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1885 n = wrapped = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1886 for (;;) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1887 int cmp;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1888 PyObject *item = PyIter_Next(it);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1889 if (item == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1890 if (PyErr_Occurred())
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1891 goto Fail;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1892 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1893 }
19808 0584c9132525 Generalize operator.indexOf (PySequence_Index) to work with any Tim Peters <tim.peters@gmail.com> parents: 19804 diff changeset	1894
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1895 cmp = PyObject_RichCompareBool(obj, item, Py_EQ);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1896 Py_DECREF(item);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1897 if (cmp < 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1898 goto Fail;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1899 if (cmp > 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1900 switch (operation) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1901 case PY_ITERSEARCH_COUNT:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1902 if (n == PY_SSIZE_T_MAX) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1903 PyErr_SetString(PyExc_OverflowError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1904 "count exceeds C integer size");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1905 goto Fail;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1906 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1907 ++n;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1908 break;
19808 0584c9132525 Generalize operator.indexOf (PySequence_Index) to work with any Tim Peters <tim.peters@gmail.com> parents: 19804 diff changeset	1909
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1910 case PY_ITERSEARCH_INDEX:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1911 if (wrapped) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1912 PyErr_SetString(PyExc_OverflowError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1913 "index exceeds C integer size");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1914 goto Fail;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1915 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1916 goto Done;
19808 0584c9132525 Generalize operator.indexOf (PySequence_Index) to work with any Tim Peters <tim.peters@gmail.com> parents: 19804 diff changeset	1917
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1918 case PY_ITERSEARCH_CONTAINS:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1919 n = 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1920 goto Done;
19808 0584c9132525 Generalize operator.indexOf (PySequence_Index) to work with any Tim Peters <tim.peters@gmail.com> parents: 19804 diff changeset	1921
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1922 default:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1923 assert(!"unknown operation");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1924 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1925 }
19808 0584c9132525 Generalize operator.indexOf (PySequence_Index) to work with any Tim Peters <tim.peters@gmail.com> parents: 19804 diff changeset	1926
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1927 if (operation == PY_ITERSEARCH_INDEX) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1928 if (n == PY_SSIZE_T_MAX)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1929 wrapped = 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1930 ++n;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1931 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1932 }
19808 0584c9132525 Generalize operator.indexOf (PySequence_Index) to work with any Tim Peters <tim.peters@gmail.com> parents: 19804 diff changeset	1933
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1934 if (operation != PY_ITERSEARCH_INDEX)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1935 goto Done;
19808 0584c9132525 Generalize operator.indexOf (PySequence_Index) to work with any Tim Peters <tim.peters@gmail.com> parents: 19804 diff changeset	1936
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1937 PyErr_SetString(PyExc_ValueError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1938 "sequence.index(x): x not in sequence");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1939 /* fall into failure code */
19808 0584c9132525 Generalize operator.indexOf (PySequence_Index) to work with any Tim Peters <tim.peters@gmail.com> parents: 19804 diff changeset	1940 Fail:
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1941 n = -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1942 /* fall through */
19808 0584c9132525 Generalize operator.indexOf (PySequence_Index) to work with any Tim Peters <tim.peters@gmail.com> parents: 19804 diff changeset	1943 Done:
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1944 Py_DECREF(it);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1945 return n;
17690 ee4d17862b61 Generalize PySequence_Count() (operator.countOf) to work with iterators. Tim Peters <tim.peters@gmail.com> parents: 17688 diff changeset	1946
19808 0584c9132525 Generalize operator.indexOf (PySequence_Index) to work with any Tim Peters <tim.peters@gmail.com> parents: 19804 diff changeset	1947 }
0584c9132525 Generalize operator.indexOf (PySequence_Index) to work with any Tim Peters <tim.peters@gmail.com> parents: 19804 diff changeset	1948
0584c9132525 Generalize operator.indexOf (PySequence_Index) to work with any Tim Peters <tim.peters@gmail.com> parents: 19804 diff changeset	1949 /* Return # of times o appears in s. */
36834 0b7809660456 Change some sequnce APIs to use Py_ssize_t. Neal Norwitz <nnorwitz@gmail.com> parents: 36675 diff changeset	1950 Py_ssize_t
19808 0584c9132525 Generalize operator.indexOf (PySequence_Index) to work with any Tim Peters <tim.peters@gmail.com> parents: 19804 diff changeset	1951 PySequence_Count(PyObject s, PyObject o)
0584c9132525 Generalize operator.indexOf (PySequence_Index) to work with any Tim Peters <tim.peters@gmail.com> parents: 19804 diff changeset	1952 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1953 return _PySequence_IterSearch(s, o, PY_ITERSEARCH_COUNT);
2840 d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	1954 }
d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	1955
17692 1812476b7fe4 Reimplement PySequence_Contains() and instance_contains(), so they work Tim Peters <tim.peters@gmail.com> parents: 17690 diff changeset	1956 /* Return -1 if error; 1 if ob in seq; 0 if ob not in seq.
19808 0584c9132525 Generalize operator.indexOf (PySequence_Index) to work with any Tim Peters <tim.peters@gmail.com> parents: 19804 diff changeset	1957 * Use sq_contains if possible, else defer to _PySequence_IterSearch().
17692 1812476b7fe4 Reimplement PySequence_Contains() and instance_contains(), so they work Tim Peters <tim.peters@gmail.com> parents: 17690 diff changeset	1958 */
1812476b7fe4 Reimplement PySequence_Contains() and instance_contains(), so they work Tim Peters <tim.peters@gmail.com> parents: 17690 diff changeset	1959 int
1812476b7fe4 Reimplement PySequence_Contains() and instance_contains(), so they work Tim Peters <tim.peters@gmail.com> parents: 17690 diff changeset	1960 PySequence_Contains(PyObject seq, PyObject ob)
1812476b7fe4 Reimplement PySequence_Contains() and instance_contains(), so they work Tim Peters <tim.peters@gmail.com> parents: 17690 diff changeset	1961 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1962 Py_ssize_t result;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1963 PySequenceMethods *sqm = seq->ob_type->tp_as_sequence;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1964 if (sqm != NULL && sqm->sq_contains != NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1965 return (*sqm->sq_contains)(seq, ob);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1966 result = _PySequence_IterSearch(seq, ob, PY_ITERSEARCH_CONTAINS);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1967 return Py_SAFE_DOWNCAST(result, Py_ssize_t, int);
17692 1812476b7fe4 Reimplement PySequence_Contains() and instance_contains(), so they work Tim Peters <tim.peters@gmail.com> parents: 17690 diff changeset	1968 }
1812476b7fe4 Reimplement PySequence_Contains() and instance_contains(), so they work Tim Peters <tim.peters@gmail.com> parents: 17690 diff changeset	1969
8400 6270c6bad811 Completely reformatted, standardizing indentation as well as Guido van Rossum <guido@python.org> parents: 7854 diff changeset	1970 /* Backwards compatibility */
6270c6bad811 Completely reformatted, standardizing indentation as well as Guido van Rossum <guido@python.org> parents: 7854 diff changeset	1971 #undef PySequence_In
6270c6bad811 Completely reformatted, standardizing indentation as well as Guido van Rossum <guido@python.org> parents: 7854 diff changeset	1972 int
13449 0409a98cd582 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	1973 PySequence_In(PyObject w, PyObject v)
2840 d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	1974 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1975 return PySequence_Contains(w, v);
2840 d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	1976 }
d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	1977
36834 0b7809660456 Change some sequnce APIs to use Py_ssize_t. Neal Norwitz <nnorwitz@gmail.com> parents: 36675 diff changeset	1978 Py_ssize_t
13449 0409a98cd582 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	1979 PySequence_Index(PyObject s, PyObject o)
2840 d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	1980 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1981 return _PySequence_IterSearch(s, o, PY_ITERSEARCH_INDEX);
2840 d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	1982 }
d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	1983
8400 6270c6bad811 Completely reformatted, standardizing indentation as well as Guido van Rossum <guido@python.org> parents: 7854 diff changeset	1984 /* Operations on mappings */
6270c6bad811 Completely reformatted, standardizing indentation as well as Guido van Rossum <guido@python.org> parents: 7854 diff changeset	1985
6270c6bad811 Completely reformatted, standardizing indentation as well as Guido van Rossum <guido@python.org> parents: 7854 diff changeset	1986 int
13449 0409a98cd582 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	1987 PyMapping_Check(PyObject *o)
2840 d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	1988 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1989 return o && o->ob_type->tp_as_mapping &&
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1990 o->ob_type->tp_as_mapping->mp_subscript;
8400 6270c6bad811 Completely reformatted, standardizing indentation as well as Guido van Rossum <guido@python.org> parents: 7854 diff changeset	1991 }
2840 d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	1992
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36484 diff changeset	1993 Py_ssize_t
13575 7c119f050290 change abstract size functions PySequence_Size &c. Jeremy Hylton <jeremy@alum.mit.edu> parents: 13451 diff changeset	1994 PyMapping_Size(PyObject *o)
8400 6270c6bad811 Completely reformatted, standardizing indentation as well as Guido van Rossum <guido@python.org> parents: 7854 diff changeset	1995 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1996 PyMappingMethods *m;
8400 6270c6bad811 Completely reformatted, standardizing indentation as well as Guido van Rossum <guido@python.org> parents: 7854 diff changeset	1997
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1998 if (o == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	1999 null_error();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2000 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2001 }
8400 6270c6bad811 Completely reformatted, standardizing indentation as well as Guido van Rossum <guido@python.org> parents: 7854 diff changeset	2002
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2003 m = o->ob_type->tp_as_mapping;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2004 if (m && m->mp_length)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2005 return m->mp_length(o);
8400 6270c6bad811 Completely reformatted, standardizing indentation as well as Guido van Rossum <guido@python.org> parents: 7854 diff changeset	2006
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2007 type_error("object of type '%.200s' has no len()", o);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2008 return -1;
2840 d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	2009 }
d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	2010
13634 6f0d96e6b5a5 Restore PyXXX_Length() APIs for binary compatibility. Marc-André Lemburg <mal@egenix.com> parents: 13575 diff changeset	2011 #undef PyMapping_Length
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36484 diff changeset	2012 Py_ssize_t
13634 6f0d96e6b5a5 Restore PyXXX_Length() APIs for binary compatibility. Marc-André Lemburg <mal@egenix.com> parents: 13575 diff changeset	2013 PyMapping_Length(PyObject *o)
6f0d96e6b5a5 Restore PyXXX_Length() APIs for binary compatibility. Marc-André Lemburg <mal@egenix.com> parents: 13575 diff changeset	2014 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2015 return PyMapping_Size(o);
13634 6f0d96e6b5a5 Restore PyXXX_Length() APIs for binary compatibility. Marc-André Lemburg <mal@egenix.com> parents: 13575 diff changeset	2016 }
6f0d96e6b5a5 Restore PyXXX_Length() APIs for binary compatibility. Marc-André Lemburg <mal@egenix.com> parents: 13575 diff changeset	2017 #define PyMapping_Length PyMapping_Size
6f0d96e6b5a5 Restore PyXXX_Length() APIs for binary compatibility. Marc-André Lemburg <mal@egenix.com> parents: 13575 diff changeset	2018
2840 d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	2019 PyObject *
13449 0409a98cd582 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	2020 PyMapping_GetItemString(PyObject o, char key)
8400 6270c6bad811 Completely reformatted, standardizing indentation as well as Guido van Rossum <guido@python.org> parents: 7854 diff changeset	2021 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2022 PyObject okey, r;
8400 6270c6bad811 Completely reformatted, standardizing indentation as well as Guido van Rossum <guido@python.org> parents: 7854 diff changeset	2023
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2024 if (key == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2025 return null_error();
8400 6270c6bad811 Completely reformatted, standardizing indentation as well as Guido van Rossum <guido@python.org> parents: 7854 diff changeset	2026
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2027 okey = PyUnicode_FromString(key);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2028 if (okey == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2029 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2030 r = PyObject_GetItem(o, okey);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2031 Py_DECREF(okey);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2032 return r;
8400 6270c6bad811 Completely reformatted, standardizing indentation as well as Guido van Rossum <guido@python.org> parents: 7854 diff changeset	2033 }
6270c6bad811 Completely reformatted, standardizing indentation as well as Guido van Rossum <guido@python.org> parents: 7854 diff changeset	2034
6270c6bad811 Completely reformatted, standardizing indentation as well as Guido van Rossum <guido@python.org> parents: 7854 diff changeset	2035 int
13449 0409a98cd582 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	2036 PyMapping_SetItemString(PyObject o, char key, PyObject *value)
2840 d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	2037 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2038 PyObject *okey;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2039 int r;
8400 6270c6bad811 Completely reformatted, standardizing indentation as well as Guido van Rossum <guido@python.org> parents: 7854 diff changeset	2040
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2041 if (key == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2042 null_error();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2043 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2044 }
2840 d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	2045
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2046 okey = PyUnicode_FromString(key);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2047 if (okey == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2048 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2049 r = PyObject_SetItem(o, okey, value);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2050 Py_DECREF(okey);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2051 return r;
8400 6270c6bad811 Completely reformatted, standardizing indentation as well as Guido van Rossum <guido@python.org> parents: 7854 diff changeset	2052 }
6270c6bad811 Completely reformatted, standardizing indentation as well as Guido van Rossum <guido@python.org> parents: 7854 diff changeset	2053
6270c6bad811 Completely reformatted, standardizing indentation as well as Guido van Rossum <guido@python.org> parents: 7854 diff changeset	2054 int
13449 0409a98cd582 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	2055 PyMapping_HasKeyString(PyObject o, char key)
8400 6270c6bad811 Completely reformatted, standardizing indentation as well as Guido van Rossum <guido@python.org> parents: 7854 diff changeset	2056 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2057 PyObject *v;
2840 d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	2058
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2059 v = PyMapping_GetItemString(o, key);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2060 if (v) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2061 Py_DECREF(v);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2062 return 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2063 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2064 PyErr_Clear();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2065 return 0;
8400 6270c6bad811 Completely reformatted, standardizing indentation as well as Guido van Rossum <guido@python.org> parents: 7854 diff changeset	2066 }
6270c6bad811 Completely reformatted, standardizing indentation as well as Guido van Rossum <guido@python.org> parents: 7854 diff changeset	2067
6270c6bad811 Completely reformatted, standardizing indentation as well as Guido van Rossum <guido@python.org> parents: 7854 diff changeset	2068 int
13449 0409a98cd582 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	2069 PyMapping_HasKey(PyObject o, PyObject key)
8400 6270c6bad811 Completely reformatted, standardizing indentation as well as Guido van Rossum <guido@python.org> parents: 7854 diff changeset	2070 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2071 PyObject *v;
8400 6270c6bad811 Completely reformatted, standardizing indentation as well as Guido van Rossum <guido@python.org> parents: 7854 diff changeset	2072
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2073 v = PyObject_GetItem(o, key);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2074 if (v) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2075 Py_DECREF(v);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2076 return 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2077 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2078 PyErr_Clear();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2079 return 0;
8400 6270c6bad811 Completely reformatted, standardizing indentation as well as Guido van Rossum <guido@python.org> parents: 7854 diff changeset	2080 }
6270c6bad811 Completely reformatted, standardizing indentation as well as Guido van Rossum <guido@python.org> parents: 7854 diff changeset	2081
40809 f340cb045bf9 - PEP 3106: dict.iterkeys(), .iteritems(), .itervalues() are now gone; Guido van Rossum <guido@python.org> parents: 40626 diff changeset	2082 PyObject *
f340cb045bf9 - PEP 3106: dict.iterkeys(), .iteritems(), .itervalues() are now gone; Guido van Rossum <guido@python.org> parents: 40626 diff changeset	2083 PyMapping_Keys(PyObject *o)
f340cb045bf9 - PEP 3106: dict.iterkeys(), .iteritems(), .itervalues() are now gone; Guido van Rossum <guido@python.org> parents: 40626 diff changeset	2084 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2085 PyObject *keys;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2086 PyObject *fast;
40809 f340cb045bf9 - PEP 3106: dict.iterkeys(), .iteritems(), .itervalues() are now gone; Guido van Rossum <guido@python.org> parents: 40626 diff changeset	2087
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2088 if (PyDict_CheckExact(o))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2089 return PyDict_Keys(o);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2090 keys = PyObject_CallMethod(o, "keys", NULL);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2091 if (keys == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2092 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2093 fast = PySequence_Fast(keys, "o.keys() are not iterable");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2094 Py_DECREF(keys);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2095 return fast;
40809 f340cb045bf9 - PEP 3106: dict.iterkeys(), .iteritems(), .itervalues() are now gone; Guido van Rossum <guido@python.org> parents: 40626 diff changeset	2096 }
f340cb045bf9 - PEP 3106: dict.iterkeys(), .iteritems(), .itervalues() are now gone; Guido van Rossum <guido@python.org> parents: 40626 diff changeset	2097
f340cb045bf9 - PEP 3106: dict.iterkeys(), .iteritems(), .itervalues() are now gone; Guido van Rossum <guido@python.org> parents: 40626 diff changeset	2098 PyObject *
f340cb045bf9 - PEP 3106: dict.iterkeys(), .iteritems(), .itervalues() are now gone; Guido van Rossum <guido@python.org> parents: 40626 diff changeset	2099 PyMapping_Items(PyObject *o)
f340cb045bf9 - PEP 3106: dict.iterkeys(), .iteritems(), .itervalues() are now gone; Guido van Rossum <guido@python.org> parents: 40626 diff changeset	2100 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2101 PyObject *items;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2102 PyObject *fast;
40809 f340cb045bf9 - PEP 3106: dict.iterkeys(), .iteritems(), .itervalues() are now gone; Guido van Rossum <guido@python.org> parents: 40626 diff changeset	2103
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2104 if (PyDict_CheckExact(o))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2105 return PyDict_Items(o);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2106 items = PyObject_CallMethod(o, "items", NULL);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2107 if (items == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2108 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2109 fast = PySequence_Fast(items, "o.items() are not iterable");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2110 Py_DECREF(items);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2111 return fast;
40809 f340cb045bf9 - PEP 3106: dict.iterkeys(), .iteritems(), .itervalues() are now gone; Guido van Rossum <guido@python.org> parents: 40626 diff changeset	2112 }
f340cb045bf9 - PEP 3106: dict.iterkeys(), .iteritems(), .itervalues() are now gone; Guido van Rossum <guido@python.org> parents: 40626 diff changeset	2113
f340cb045bf9 - PEP 3106: dict.iterkeys(), .iteritems(), .itervalues() are now gone; Guido van Rossum <guido@python.org> parents: 40626 diff changeset	2114 PyObject *
f340cb045bf9 - PEP 3106: dict.iterkeys(), .iteritems(), .itervalues() are now gone; Guido van Rossum <guido@python.org> parents: 40626 diff changeset	2115 PyMapping_Values(PyObject *o)
f340cb045bf9 - PEP 3106: dict.iterkeys(), .iteritems(), .itervalues() are now gone; Guido van Rossum <guido@python.org> parents: 40626 diff changeset	2116 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2117 PyObject *values;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2118 PyObject *fast;
40809 f340cb045bf9 - PEP 3106: dict.iterkeys(), .iteritems(), .itervalues() are now gone; Guido van Rossum <guido@python.org> parents: 40626 diff changeset	2119
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2120 if (PyDict_CheckExact(o))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2121 return PyDict_Values(o);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2122 values = PyObject_CallMethod(o, "values", NULL);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2123 if (values == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2124 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2125 fast = PySequence_Fast(values, "o.values() are not iterable");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2126 Py_DECREF(values);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2127 return fast;
40809 f340cb045bf9 - PEP 3106: dict.iterkeys(), .iteritems(), .itervalues() are now gone; Guido van Rossum <guido@python.org> parents: 40626 diff changeset	2128 }
f340cb045bf9 - PEP 3106: dict.iterkeys(), .iteritems(), .itervalues() are now gone; Guido van Rossum <guido@python.org> parents: 40626 diff changeset	2129
8400 6270c6bad811 Completely reformatted, standardizing indentation as well as Guido van Rossum <guido@python.org> parents: 7854 diff changeset	2130 /* Operations on callable objects */
6270c6bad811 Completely reformatted, standardizing indentation as well as Guido van Rossum <guido@python.org> parents: 7854 diff changeset	2131
6270c6bad811 Completely reformatted, standardizing indentation as well as Guido van Rossum <guido@python.org> parents: 7854 diff changeset	2132 /* XXX PyCallable_Check() is in object.c */
6270c6bad811 Completely reformatted, standardizing indentation as well as Guido van Rossum <guido@python.org> parents: 7854 diff changeset	2133
6270c6bad811 Completely reformatted, standardizing indentation as well as Guido van Rossum <guido@python.org> parents: 7854 diff changeset	2134 PyObject *
13449 0409a98cd582 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	2135 PyObject_CallObject(PyObject o, PyObject a)
8400 6270c6bad811 Completely reformatted, standardizing indentation as well as Guido van Rossum <guido@python.org> parents: 7854 diff changeset	2136 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2137 return PyEval_CallObjectWithKeywords(o, a, NULL);
8400 6270c6bad811 Completely reformatted, standardizing indentation as well as Guido van Rossum <guido@python.org> parents: 7854 diff changeset	2138 }
2840 d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	2139
d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	2140 PyObject *
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17976 diff changeset	2141 PyObject_Call(PyObject func, PyObject arg, PyObject *kw)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17976 diff changeset	2142 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2143 ternaryfunc call;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17976 diff changeset	2144
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2145 if ((call = func->ob_type->tp_call) != NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2146 PyObject *result;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2147 if (Py_EnterRecursiveCall(" while calling a Python object"))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2148 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2149 result = (*call)(func, arg, kw);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2150 Py_LeaveRecursiveCall();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2151 if (result == NULL && !PyErr_Occurred())
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2152 PyErr_SetString(
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2153 PyExc_SystemError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2154 "NULL result without error in PyObject_Call");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2155 return result;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2156 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2157 PyErr_Format(PyExc_TypeError, "'%.200s' object is not callable",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2158 func->ob_type->tp_name);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2159 return NULL;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17976 diff changeset	2160 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17976 diff changeset	2161
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	2162 static PyObject*
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	2163 call_function_tail(PyObject callable, PyObject args)
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	2164 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2165 PyObject *retval;
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	2166
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2167 if (args == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2168 return NULL;
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	2169
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2170 if (!PyTuple_Check(args)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2171 PyObject *a;
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	2172
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2173 a = PyTuple_New(1);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2174 if (a == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2175 Py_DECREF(args);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2176 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2177 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2178 PyTuple_SET_ITEM(a, 0, args);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2179 args = a;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2180 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2181 retval = PyObject_Call(callable, args, NULL);
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	2182
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2183 Py_DECREF(args);
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	2184
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2185 return retval;
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	2186 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	2187
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17976 diff changeset	2188 PyObject *
8400 6270c6bad811 Completely reformatted, standardizing indentation as well as Guido van Rossum <guido@python.org> parents: 7854 diff changeset	2189 PyObject_CallFunction(PyObject callable, char format, ...)
2840 d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	2190 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2191 va_list va;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2192 PyObject *args;
2840 d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	2193
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2194 if (callable == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2195 return null_error();
20719 5e347e4e05bf PyObject_CallFunction(), PyObject_CallMethod(): Make sure we do not touch Fred Drake <fdrake@acm.org> parents: 20694 diff changeset	2196
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2197 if (format && *format) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2198 va_start(va, format);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2199 args = Py_VaBuildValue(format, va);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2200 va_end(va);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2201 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2202 else
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2203 args = PyTuple_New(0);
8400 6270c6bad811 Completely reformatted, standardizing indentation as well as Guido van Rossum <guido@python.org> parents: 7854 diff changeset	2204
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2205 return call_function_tail(callable, args);
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	2206 }
2840 d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	2207
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	2208 PyObject *
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	2209 _PyObject_CallFunction_SizeT(PyObject callable, char format, ...)
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	2210 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2211 va_list va;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2212 PyObject *args;
2840 d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	2213
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2214 if (callable == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2215 return null_error();
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	2216
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2217 if (format && *format) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2218 va_start(va, format);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2219 args = _Py_VaBuildValue_SizeT(format, va);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2220 va_end(va);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2221 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2222 else
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2223 args = PyTuple_New(0);
8400 6270c6bad811 Completely reformatted, standardizing indentation as well as Guido van Rossum <guido@python.org> parents: 7854 diff changeset	2224
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2225 return call_function_tail(callable, args);
2840 d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	2226 }
d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	2227
d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	2228 PyObject *
d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	2229 PyObject_CallMethod(PyObject o, char name, char *format, ...)
d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	2230 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2231 va_list va;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2232 PyObject *args;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2233 PyObject *func = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2234 PyObject *retval = NULL;
2840 d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	2235
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2236 if (o == NULL \|\| name == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2237 return null_error();
2840 d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	2238
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2239 func = PyObject_GetAttrString(o, name);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2240 if (func == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2241 PyErr_SetString(PyExc_AttributeError, name);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2242 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2243 }
2840 d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	2244
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2245 if (!PyCallable_Check(func)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2246 type_error("attribute of type '%.200s' is not callable", func);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2247 goto exit;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2248 }
20719 5e347e4e05bf PyObject_CallFunction(), PyObject_CallMethod(): Make sure we do not touch Fred Drake <fdrake@acm.org> parents: 20694 diff changeset	2249
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2250 if (format && *format) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2251 va_start(va, format);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2252 args = Py_VaBuildValue(format, va);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2253 va_end(va);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2254 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2255 else
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2256 args = PyTuple_New(0);
2840 d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	2257
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2258 retval = call_function_tail(func, args);
2840 d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	2259
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	2260 exit:
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2261 /* args gets consumed in call_function_tail */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2262 Py_XDECREF(func);
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	2263
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2264 return retval;
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	2265 }
2840 d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	2266
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	2267 PyObject *
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	2268 _PyObject_CallMethod_SizeT(PyObject o, char name, char *format, ...)
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	2269 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2270 va_list va;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2271 PyObject *args;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2272 PyObject *func = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2273 PyObject *retval = NULL;
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	2274
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2275 if (o == NULL \|\| name == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2276 return null_error();
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	2277
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2278 func = PyObject_GetAttrString(o, name);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2279 if (func == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2280 PyErr_SetString(PyExc_AttributeError, name);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2281 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2282 }
2840 d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	2283
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2284 if (!PyCallable_Check(func)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2285 type_error("attribute of type '%.200s' is not callable", func);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2286 goto exit;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2287 }
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	2288
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2289 if (format && *format) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2290 va_start(va, format);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2291 args = _Py_VaBuildValue_SizeT(format, va);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2292 va_end(va);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2293 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2294 else
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2295 args = PyTuple_New(0);
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	2296
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2297 retval = call_function_tail(func, args);
2840 d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	2298
35225 ddd78ea3519c Fix: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2299 exit:
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2300 /* args gets consumed in call_function_tail */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2301 Py_XDECREF(func);
8400 6270c6bad811 Completely reformatted, standardizing indentation as well as Guido van Rossum <guido@python.org> parents: 7854 diff changeset	2302
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2303 return retval;
2840 d5398acafa2c Generic Abstract Object Interface Guido van Rossum <guido@python.org> parents: diff changeset	2304 }
17111 bf678a11c21a Move the code implementing isinstance() and issubclass() to new C Guido van Rossum <guido@python.org> parents: 15944 diff changeset	2305
bf678a11c21a Move the code implementing isinstance() and issubclass() to new C Guido van Rossum <guido@python.org> parents: 15944 diff changeset	2306
20694 d02068d163cf Added two new functions to conveniently call functions/methods from C. Fred Drake <fdrake@acm.org> parents: 20683 diff changeset	2307 static PyObject *
20729 cd600039a123 PyObject_CallFunctionObArgs() ---> PyObject_CallFunctionObjArgs() Fred Drake <fdrake@acm.org> parents: 20719 diff changeset	2308 objargs_mktuple(va_list va)
20694 d02068d163cf Added two new functions to conveniently call functions/methods from C. Fred Drake <fdrake@acm.org> parents: 20683 diff changeset	2309 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2310 int i, n = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2311 va_list countva;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2312 PyObject result, tmp;
20694 d02068d163cf Added two new functions to conveniently call functions/methods from C. Fred Drake <fdrake@acm.org> parents: 20683 diff changeset	2313
63924 9108e7dcd7d8 Issue #2443: Added a new macro, Py_VA_COPY, which is equivalent to C99 Alexander Belopolsky <alexander.belopolsky@gmail.com> parents: 62608 diff changeset	2314 Py_VA_COPY(countva, va);
20694 d02068d163cf Added two new functions to conveniently call functions/methods from C. Fred Drake <fdrake@acm.org> parents: 20683 diff changeset	2315
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2316 while (((PyObject )va_arg(countva, PyObject )) != NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2317 ++n;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2318 result = PyTuple_New(n);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2319 if (result != NULL && n > 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2320 for (i = 0; i < n; ++i) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2321 tmp = (PyObject )va_arg(va, PyObject );
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2322 PyTuple_SET_ITEM(result, i, tmp);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2323 Py_INCREF(tmp);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2324 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2325 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2326 return result;
20694 d02068d163cf Added two new functions to conveniently call functions/methods from C. Fred Drake <fdrake@acm.org> parents: 20683 diff changeset	2327 }
d02068d163cf Added two new functions to conveniently call functions/methods from C. Fred Drake <fdrake@acm.org> parents: 20683 diff changeset	2328
d02068d163cf Added two new functions to conveniently call functions/methods from C. Fred Drake <fdrake@acm.org> parents: 20683 diff changeset	2329 PyObject *
20729 cd600039a123 PyObject_CallFunctionObArgs() ---> PyObject_CallFunctionObjArgs() Fred Drake <fdrake@acm.org> parents: 20719 diff changeset	2330 PyObject_CallMethodObjArgs(PyObject callable, PyObject name, ...)
20694 d02068d163cf Added two new functions to conveniently call functions/methods from C. Fred Drake <fdrake@acm.org> parents: 20683 diff changeset	2331 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2332 PyObject args, tmp;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2333 va_list vargs;
20694 d02068d163cf Added two new functions to conveniently call functions/methods from C. Fred Drake <fdrake@acm.org> parents: 20683 diff changeset	2334
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2335 if (callable == NULL \|\| name == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2336 return null_error();
20694 d02068d163cf Added two new functions to conveniently call functions/methods from C. Fred Drake <fdrake@acm.org> parents: 20683 diff changeset	2337
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2338 callable = PyObject_GetAttr(callable, name);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2339 if (callable == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2340 return NULL;
20694 d02068d163cf Added two new functions to conveniently call functions/methods from C. Fred Drake <fdrake@acm.org> parents: 20683 diff changeset	2341
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2342 /* count the args */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2343 va_start(vargs, name);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2344 args = objargs_mktuple(vargs);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2345 va_end(vargs);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2346 if (args == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2347 Py_DECREF(callable);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2348 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2349 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2350 tmp = PyObject_Call(callable, args, NULL);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2351 Py_DECREF(args);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2352 Py_DECREF(callable);
20694 d02068d163cf Added two new functions to conveniently call functions/methods from C. Fred Drake <fdrake@acm.org> parents: 20683 diff changeset	2353
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2354 return tmp;
20694 d02068d163cf Added two new functions to conveniently call functions/methods from C. Fred Drake <fdrake@acm.org> parents: 20683 diff changeset	2355 }
d02068d163cf Added two new functions to conveniently call functions/methods from C. Fred Drake <fdrake@acm.org> parents: 20683 diff changeset	2356
d02068d163cf Added two new functions to conveniently call functions/methods from C. Fred Drake <fdrake@acm.org> parents: 20683 diff changeset	2357 PyObject *
20729 cd600039a123 PyObject_CallFunctionObArgs() ---> PyObject_CallFunctionObjArgs() Fred Drake <fdrake@acm.org> parents: 20719 diff changeset	2358 PyObject_CallFunctionObjArgs(PyObject *callable, ...)
20694 d02068d163cf Added two new functions to conveniently call functions/methods from C. Fred Drake <fdrake@acm.org> parents: 20683 diff changeset	2359 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2360 PyObject args, tmp;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2361 va_list vargs;
20694 d02068d163cf Added two new functions to conveniently call functions/methods from C. Fred Drake <fdrake@acm.org> parents: 20683 diff changeset	2362
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2363 if (callable == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2364 return null_error();
20694 d02068d163cf Added two new functions to conveniently call functions/methods from C. Fred Drake <fdrake@acm.org> parents: 20683 diff changeset	2365
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2366 /* count the args */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2367 va_start(vargs, callable);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2368 args = objargs_mktuple(vargs);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2369 va_end(vargs);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2370 if (args == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2371 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2372 tmp = PyObject_Call(callable, args, NULL);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2373 Py_DECREF(args);
20694 d02068d163cf Added two new functions to conveniently call functions/methods from C. Fred Drake <fdrake@acm.org> parents: 20683 diff changeset	2374
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2375 return tmp;
20694 d02068d163cf Added two new functions to conveniently call functions/methods from C. Fred Drake <fdrake@acm.org> parents: 20683 diff changeset	2376 }
d02068d163cf Added two new functions to conveniently call functions/methods from C. Fred Drake <fdrake@acm.org> parents: 20683 diff changeset	2377
d02068d163cf Added two new functions to conveniently call functions/methods from C. Fred Drake <fdrake@acm.org> parents: 20683 diff changeset	2378
17111 bf678a11c21a Move the code implementing isinstance() and issubclass() to new C Guido van Rossum <guido@python.org> parents: 15944 diff changeset	2379 /* isinstance(), issubclass() */
bf678a11c21a Move the code implementing isinstance() and issubclass() to new C Guido van Rossum <guido@python.org> parents: 15944 diff changeset	2380
23260 9e3532b75471 abstract_get_bases(): Clarify exactly what the return values and Barry Warsaw <barry@python.org> parents: 23090 diff changeset	2381 /* abstract_get_bases() has logically 4 return states, with a sort of 0th
9e3532b75471 abstract_get_bases(): Clarify exactly what the return values and Barry Warsaw <barry@python.org> parents: 23090 diff changeset	2382 * state that will almost never happen.
9e3532b75471 abstract_get_bases(): Clarify exactly what the return values and Barry Warsaw <barry@python.org> parents: 23090 diff changeset	2383 *
9e3532b75471 abstract_get_bases(): Clarify exactly what the return values and Barry Warsaw <barry@python.org> parents: 23090 diff changeset	2384 * 0. creating the __bases__ static string could get a MemoryError
9e3532b75471 abstract_get_bases(): Clarify exactly what the return values and Barry Warsaw <barry@python.org> parents: 23090 diff changeset	2385 * 1. getattr(cls, '__bases__') could raise an AttributeError
9e3532b75471 abstract_get_bases(): Clarify exactly what the return values and Barry Warsaw <barry@python.org> parents: 23090 diff changeset	2386 * 2. getattr(cls, '__bases__') could raise some other exception
9e3532b75471 abstract_get_bases(): Clarify exactly what the return values and Barry Warsaw <barry@python.org> parents: 23090 diff changeset	2387 * 3. getattr(cls, '__bases__') could return a tuple
9e3532b75471 abstract_get_bases(): Clarify exactly what the return values and Barry Warsaw <barry@python.org> parents: 23090 diff changeset	2388 * 4. getattr(cls, '__bases__') could return something other than a tuple
9e3532b75471 abstract_get_bases(): Clarify exactly what the return values and Barry Warsaw <barry@python.org> parents: 23090 diff changeset	2389 *
9e3532b75471 abstract_get_bases(): Clarify exactly what the return values and Barry Warsaw <barry@python.org> parents: 23090 diff changeset	2390 * Only state #3 is a non-error state and only it returns a non-NULL object
9e3532b75471 abstract_get_bases(): Clarify exactly what the return values and Barry Warsaw <barry@python.org> parents: 23090 diff changeset	2391 * (it returns the retrieved tuple).
9e3532b75471 abstract_get_bases(): Clarify exactly what the return values and Barry Warsaw <barry@python.org> parents: 23090 diff changeset	2392 *
9e3532b75471 abstract_get_bases(): Clarify exactly what the return values and Barry Warsaw <barry@python.org> parents: 23090 diff changeset	2393 * Any raised AttributeErrors are masked by clearing the exception and
9e3532b75471 abstract_get_bases(): Clarify exactly what the return values and Barry Warsaw <barry@python.org> parents: 23090 diff changeset	2394 * returning NULL. If an object other than a tuple comes out of __bases__,
9e3532b75471 abstract_get_bases(): Clarify exactly what the return values and Barry Warsaw <barry@python.org> parents: 23090 diff changeset	2395 * then again, the return value is NULL. So yes, these two situations
9e3532b75471 abstract_get_bases(): Clarify exactly what the return values and Barry Warsaw <barry@python.org> parents: 23090 diff changeset	2396 * produce exactly the same results: NULL is returned and no error is set.
9e3532b75471 abstract_get_bases(): Clarify exactly what the return values and Barry Warsaw <barry@python.org> parents: 23090 diff changeset	2397 *
9e3532b75471 abstract_get_bases(): Clarify exactly what the return values and Barry Warsaw <barry@python.org> parents: 23090 diff changeset	2398 * If some exception other than AttributeError is raised, then NULL is also
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2399 * returned, but the exception is not cleared. That's because we want the
23260 9e3532b75471 abstract_get_bases(): Clarify exactly what the return values and Barry Warsaw <barry@python.org> parents: 23090 diff changeset	2400 * exception to be propagated along.
9e3532b75471 abstract_get_bases(): Clarify exactly what the return values and Barry Warsaw <barry@python.org> parents: 23090 diff changeset	2401 *
9e3532b75471 abstract_get_bases(): Clarify exactly what the return values and Barry Warsaw <barry@python.org> parents: 23090 diff changeset	2402 * Callers are expected to test for PyErr_Occurred() when the return value
9e3532b75471 abstract_get_bases(): Clarify exactly what the return values and Barry Warsaw <barry@python.org> parents: 23090 diff changeset	2403 * is NULL to decide whether a valid exception should be propagated or not.
9e3532b75471 abstract_get_bases(): Clarify exactly what the return values and Barry Warsaw <barry@python.org> parents: 23090 diff changeset	2404 * When there's no exception to propagate, it's customary for the caller to
9e3532b75471 abstract_get_bases(): Clarify exactly what the return values and Barry Warsaw <barry@python.org> parents: 23090 diff changeset	2405 * set a TypeError.
9e3532b75471 abstract_get_bases(): Clarify exactly what the return values and Barry Warsaw <barry@python.org> parents: 23090 diff changeset	2406 */
20507 364c238a6871 Fix error checking done by abstract_issubclass and abstract_isinstance. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 20307 diff changeset	2407 static PyObject *
364c238a6871 Fix error checking done by abstract_issubclass and abstract_isinstance. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 20307 diff changeset	2408 abstract_get_bases(PyObject *cls)
17111 bf678a11c21a Move the code implementing isinstance() and issubclass() to new C Guido van Rossum <guido@python.org> parents: 15944 diff changeset	2409 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2410 static PyObject *__bases__ = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2411 PyObject *bases;
17111 bf678a11c21a Move the code implementing isinstance() and issubclass() to new C Guido van Rossum <guido@python.org> parents: 15944 diff changeset	2412
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2413 if (__bases__ == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2414 __bases__ = PyUnicode_InternFromString("__bases__");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2415 if (__bases__ == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2416 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2417 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2418 Py_ALLOW_RECURSION
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2419 bases = PyObject_GetAttr(cls, __bases__);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2420 Py_END_ALLOW_RECURSION
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2421 if (bases == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2422 if (PyErr_ExceptionMatches(PyExc_AttributeError))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2423 PyErr_Clear();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2424 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2425 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2426 if (!PyTuple_Check(bases)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2427 Py_DECREF(bases);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2428 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2429 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2430 return bases;
20507 364c238a6871 Fix error checking done by abstract_issubclass and abstract_isinstance. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 20307 diff changeset	2431 }
364c238a6871 Fix error checking done by abstract_issubclass and abstract_isinstance. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 20307 diff changeset	2432
364c238a6871 Fix error checking done by abstract_issubclass and abstract_isinstance. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 20307 diff changeset	2433
364c238a6871 Fix error checking done by abstract_issubclass and abstract_isinstance. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 20307 diff changeset	2434 static int
364c238a6871 Fix error checking done by abstract_issubclass and abstract_isinstance. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 20307 diff changeset	2435 abstract_issubclass(PyObject derived, PyObject cls)
364c238a6871 Fix error checking done by abstract_issubclass and abstract_isinstance. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 20307 diff changeset	2436 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2437 PyObject *bases = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2438 Py_ssize_t i, n;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2439 int r = 0;
20507 364c238a6871 Fix error checking done by abstract_issubclass and abstract_isinstance. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 20307 diff changeset	2440
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2441 while (1) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2442 if (derived == cls)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2443 return 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2444 bases = abstract_get_bases(derived);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2445 if (bases == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2446 if (PyErr_Occurred())
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2447 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2448 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2449 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2450 n = PyTuple_GET_SIZE(bases);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2451 if (n == 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2452 Py_DECREF(bases);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2453 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2454 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2455 /* Avoid recursivity in the single inheritance case */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2456 if (n == 1) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2457 derived = PyTuple_GET_ITEM(bases, 0);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2458 Py_DECREF(bases);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2459 continue;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2460 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2461 for (i = 0; i < n; i++) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2462 r = abstract_issubclass(PyTuple_GET_ITEM(bases, i), cls);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2463 if (r != 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2464 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2465 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2466 Py_DECREF(bases);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2467 return r;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2468 }
17111 bf678a11c21a Move the code implementing isinstance() and issubclass() to new C Guido van Rossum <guido@python.org> parents: 15944 diff changeset	2469 }
bf678a11c21a Move the code implementing isinstance() and issubclass() to new C Guido van Rossum <guido@python.org> parents: 15944 diff changeset	2470
26612 97f83542f8ee Enhance issubclass() and PyObject_IsSubclass() so that a tuple is Walter Dörwald <walter@livinglogic.de> parents: 26567 diff changeset	2471 static int
97f83542f8ee Enhance issubclass() and PyObject_IsSubclass() so that a tuple is Walter Dörwald <walter@livinglogic.de> parents: 26567 diff changeset	2472 check_class(PyObject cls, const char error)
97f83542f8ee Enhance issubclass() and PyObject_IsSubclass() so that a tuple is Walter Dörwald <walter@livinglogic.de> parents: 26567 diff changeset	2473 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2474 PyObject *bases = abstract_get_bases(cls);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2475 if (bases == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2476 /* Do not mask errors. */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2477 if (!PyErr_Occurred())
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2478 PyErr_SetString(PyExc_TypeError, error);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2479 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2480 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2481 Py_DECREF(bases);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2482 return -1;
26612 97f83542f8ee Enhance issubclass() and PyObject_IsSubclass() so that a tuple is Walter Dörwald <walter@livinglogic.de> parents: 26567 diff changeset	2483 }
97f83542f8ee Enhance issubclass() and PyObject_IsSubclass() so that a tuple is Walter Dörwald <walter@livinglogic.de> parents: 26567 diff changeset	2484
31723 d69fb35f1eae Limit the nesting depth of a tuple passed as the second argument to Brett Cannon <bcannon@gmail.com> parents: 31676 diff changeset	2485 static int
48875 d6e86a96f9b3 Issue #2534: speed up isinstance() and issubclass() by 50-70%, so as to Antoine Pitrou <solipsis@pitrou.net> parents: 48693 diff changeset	2486 recursive_isinstance(PyObject inst, PyObject cls)
17111 bf678a11c21a Move the code implementing isinstance() and issubclass() to new C Guido van Rossum <guido@python.org> parents: 15944 diff changeset	2487 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2488 PyObject *icls;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2489 static PyObject *__class__ = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2490 int retval = 0;
17111 bf678a11c21a Move the code implementing isinstance() and issubclass() to new C Guido van Rossum <guido@python.org> parents: 15944 diff changeset	2491
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2492 if (__class__ == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2493 __class__ = PyUnicode_InternFromString("__class__");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2494 if (__class__ == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2495 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2496 }
27829 4a02ca6bdb6f SF #532767: isinstance(x, X) should work when x is a proxy for an X Guido van Rossum <guido@python.org> parents: 27793 diff changeset	2497
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2498 if (PyType_Check(cls)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2499 retval = PyObject_TypeCheck(inst, (PyTypeObject *)cls);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2500 if (retval == 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2501 PyObject *c = PyObject_GetAttr(inst, __class__);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2502 if (c == NULL) {
66297 66d40b6a2bb1 code style Benjamin Peterson <benjamin@python.org> parents: 66291 diff changeset	2503 if (PyErr_ExceptionMatches(PyExc_AttributeError))
66291 80b48a3a2473 #1574217: only swallow AttributeErrors in isinstance, not everything. R. David Murray <rdmurray@bitdance.com> parents: 64650 diff changeset	2504 PyErr_Clear();
66297 66d40b6a2bb1 code style Benjamin Peterson <benjamin@python.org> parents: 66291 diff changeset	2505 else
66291 80b48a3a2473 #1574217: only swallow AttributeErrors in isinstance, not everything. R. David Murray <rdmurray@bitdance.com> parents: 64650 diff changeset	2506 retval = -1;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2507 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2508 else {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2509 if (c != (PyObject *)(inst->ob_type) &&
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2510 PyType_Check(c))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2511 retval = PyType_IsSubtype(
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2512 (PyTypeObject *)c,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2513 (PyTypeObject *)cls);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2514 Py_DECREF(c);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2515 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2516 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2517 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2518 else {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2519 if (!check_class(cls,
62610 ce0325276d2a Merged revisions 82342 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 61467 diff changeset	2520 "isinstance() arg 2 must be a type or tuple of types"))
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2521 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2522 icls = PyObject_GetAttr(inst, __class__);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2523 if (icls == NULL) {
66297 66d40b6a2bb1 code style Benjamin Peterson <benjamin@python.org> parents: 66291 diff changeset	2524 if (PyErr_ExceptionMatches(PyExc_AttributeError))
66291 80b48a3a2473 #1574217: only swallow AttributeErrors in isinstance, not everything. R. David Murray <rdmurray@bitdance.com> parents: 64650 diff changeset	2525 PyErr_Clear();
66297 66d40b6a2bb1 code style Benjamin Peterson <benjamin@python.org> parents: 66291 diff changeset	2526 else
66291 80b48a3a2473 #1574217: only swallow AttributeErrors in isinstance, not everything. R. David Murray <rdmurray@bitdance.com> parents: 64650 diff changeset	2527 retval = -1;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2528 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2529 else {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2530 retval = abstract_issubclass(icls, cls);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2531 Py_DECREF(icls);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2532 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2533 }
17111 bf678a11c21a Move the code implementing isinstance() and issubclass() to new C Guido van Rossum <guido@python.org> parents: 15944 diff changeset	2534
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2535 return retval;
17111 bf678a11c21a Move the code implementing isinstance() and issubclass() to new C Guido van Rossum <guido@python.org> parents: 15944 diff changeset	2536 }
bf678a11c21a Move the code implementing isinstance() and issubclass() to new C Guido van Rossum <guido@python.org> parents: 15944 diff changeset	2537
bf678a11c21a Move the code implementing isinstance() and issubclass() to new C Guido van Rossum <guido@python.org> parents: 15944 diff changeset	2538 int
31723 d69fb35f1eae Limit the nesting depth of a tuple passed as the second argument to Brett Cannon <bcannon@gmail.com> parents: 31676 diff changeset	2539 PyObject_IsInstance(PyObject inst, PyObject cls)
d69fb35f1eae Limit the nesting depth of a tuple passed as the second argument to Brett Cannon <bcannon@gmail.com> parents: 31676 diff changeset	2540 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2541 static PyObject *name = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2542 PyObject *checker;
45931 1657f0acca78 Merged revisions 61538-61540,61556,61559-61560,61563,61565,61571,61575-61576,61580-61582,61586,61591,61593,61595,61605-61606,61613-61616,61618,61621-61623,61625,61627,61631-61634 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45766 diff changeset	2543
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2544 /* Quick test for an exact match */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2545 if (Py_TYPE(inst) == (PyTypeObject *)cls)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2546 return 1;
45931 1657f0acca78 Merged revisions 61538-61540,61556,61559-61560,61563,61565,61571,61575-61576,61580-61582,61586,61591,61593,61595,61605-61606,61613-61616,61618,61621-61623,61625,61627,61631-61634 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45766 diff changeset	2547
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2548 if (PyTuple_Check(cls)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2549 Py_ssize_t i;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2550 Py_ssize_t n;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2551 int r = 0;
48875 d6e86a96f9b3 Issue #2534: speed up isinstance() and issubclass() by 50-70%, so as to Antoine Pitrou <solipsis@pitrou.net> parents: 48693 diff changeset	2552
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2553 if (Py_EnterRecursiveCall(" in __instancecheck__"))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2554 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2555 n = PyTuple_GET_SIZE(cls);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2556 for (i = 0; i < n; ++i) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2557 PyObject *item = PyTuple_GET_ITEM(cls, i);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2558 r = PyObject_IsInstance(inst, item);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2559 if (r != 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2560 /* either found it, or got an error */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2561 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2562 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2563 Py_LeaveRecursiveCall();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2564 return r;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2565 }
54119 f9f997c1fd81 Merged revisions 72690 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 53960 diff changeset	2566
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2567 checker = _PyObject_LookupSpecial(cls, "__instancecheck__", &name);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2568 if (checker != NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2569 PyObject *res;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2570 int ok = -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2571 if (Py_EnterRecursiveCall(" in __instancecheck__")) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2572 Py_DECREF(checker);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2573 return ok;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2574 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2575 res = PyObject_CallFunctionObjArgs(checker, inst, NULL);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2576 Py_LeaveRecursiveCall();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2577 Py_DECREF(checker);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2578 if (res != NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2579 ok = PyObject_IsTrue(res);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2580 Py_DECREF(res);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2581 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2582 return ok;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2583 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2584 else if (PyErr_Occurred())
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2585 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2586 return recursive_isinstance(inst, cls);
31723 d69fb35f1eae Limit the nesting depth of a tuple passed as the second argument to Brett Cannon <bcannon@gmail.com> parents: 31676 diff changeset	2587 }
d69fb35f1eae Limit the nesting depth of a tuple passed as the second argument to Brett Cannon <bcannon@gmail.com> parents: 31676 diff changeset	2588
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2589 static int
48875 d6e86a96f9b3 Issue #2534: speed up isinstance() and issubclass() by 50-70%, so as to Antoine Pitrou <solipsis@pitrou.net> parents: 48693 diff changeset	2590 recursive_issubclass(PyObject derived, PyObject cls)
17111 bf678a11c21a Move the code implementing isinstance() and issubclass() to new C Guido van Rossum <guido@python.org> parents: 15944 diff changeset	2591 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2592 if (PyType_Check(cls) && PyType_Check(derived)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2593 /* Fast path (non-recursive) */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2594 return PyType_IsSubtype((PyTypeObject )derived, (PyTypeObject )cls);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2595 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2596 if (!check_class(derived,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2597 "issubclass() arg 1 must be a class"))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2598 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2599 if (!check_class(cls,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2600 "issubclass() arg 2 must be a class"
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2601 " or tuple of classes"))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2602 return -1;
31723 d69fb35f1eae Limit the nesting depth of a tuple passed as the second argument to Brett Cannon <bcannon@gmail.com> parents: 31676 diff changeset	2603
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2604 return abstract_issubclass(derived, cls);
17111 bf678a11c21a Move the code implementing isinstance() and issubclass() to new C Guido van Rossum <guido@python.org> parents: 15944 diff changeset	2605 }
17597 32e7d0898eab Iterators phase 1. This comprises: Guido van Rossum <guido@python.org> parents: 17111 diff changeset	2606
31723 d69fb35f1eae Limit the nesting depth of a tuple passed as the second argument to Brett Cannon <bcannon@gmail.com> parents: 31676 diff changeset	2607 int
d69fb35f1eae Limit the nesting depth of a tuple passed as the second argument to Brett Cannon <bcannon@gmail.com> parents: 31676 diff changeset	2608 PyObject_IsSubclass(PyObject derived, PyObject cls)
d69fb35f1eae Limit the nesting depth of a tuple passed as the second argument to Brett Cannon <bcannon@gmail.com> parents: 31676 diff changeset	2609 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2610 static PyObject *name = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2611 PyObject *checker;
54135 d841f97243b5 Remove unused variables. Georg Brandl <georg@python.org> parents: 54119 diff changeset	2612
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2613 if (PyTuple_Check(cls)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2614 Py_ssize_t i;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2615 Py_ssize_t n;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2616 int r = 0;
48875 d6e86a96f9b3 Issue #2534: speed up isinstance() and issubclass() by 50-70%, so as to Antoine Pitrou <solipsis@pitrou.net> parents: 48693 diff changeset	2617
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2618 if (Py_EnterRecursiveCall(" in __subclasscheck__"))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2619 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2620 n = PyTuple_GET_SIZE(cls);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2621 for (i = 0; i < n; ++i) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2622 PyObject *item = PyTuple_GET_ITEM(cls, i);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2623 r = PyObject_IsSubclass(derived, item);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2624 if (r != 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2625 /* either found it, or got an error */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2626 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2627 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2628 Py_LeaveRecursiveCall();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2629 return r;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2630 }
54119 f9f997c1fd81 Merged revisions 72690 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 53960 diff changeset	2631
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2632 checker = _PyObject_LookupSpecial(cls, "__subclasscheck__", &name);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2633 if (checker != NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2634 PyObject *res;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2635 int ok = -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2636 if (Py_EnterRecursiveCall(" in __subclasscheck__")) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2637 Py_DECREF(checker);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2638 return ok;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2639 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2640 res = PyObject_CallFunctionObjArgs(checker, derived, NULL);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2641 Py_LeaveRecursiveCall();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2642 Py_DECREF(checker);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2643 if (res != NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2644 ok = PyObject_IsTrue(res);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2645 Py_DECREF(res);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2646 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2647 return ok;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2648 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2649 else if (PyErr_Occurred())
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2650 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2651 return recursive_issubclass(derived, cls);
48875 d6e86a96f9b3 Issue #2534: speed up isinstance() and issubclass() by 50-70%, so as to Antoine Pitrou <solipsis@pitrou.net> parents: 48693 diff changeset	2652 }
d6e86a96f9b3 Issue #2534: speed up isinstance() and issubclass() by 50-70%, so as to Antoine Pitrou <solipsis@pitrou.net> parents: 48693 diff changeset	2653
d6e86a96f9b3 Issue #2534: speed up isinstance() and issubclass() by 50-70%, so as to Antoine Pitrou <solipsis@pitrou.net> parents: 48693 diff changeset	2654 int
d6e86a96f9b3 Issue #2534: speed up isinstance() and issubclass() by 50-70%, so as to Antoine Pitrou <solipsis@pitrou.net> parents: 48693 diff changeset	2655 _PyObject_RealIsInstance(PyObject inst, PyObject cls)
d6e86a96f9b3 Issue #2534: speed up isinstance() and issubclass() by 50-70%, so as to Antoine Pitrou <solipsis@pitrou.net> parents: 48693 diff changeset	2656 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2657 return recursive_isinstance(inst, cls);
48875 d6e86a96f9b3 Issue #2534: speed up isinstance() and issubclass() by 50-70%, so as to Antoine Pitrou <solipsis@pitrou.net> parents: 48693 diff changeset	2658 }
d6e86a96f9b3 Issue #2534: speed up isinstance() and issubclass() by 50-70%, so as to Antoine Pitrou <solipsis@pitrou.net> parents: 48693 diff changeset	2659
d6e86a96f9b3 Issue #2534: speed up isinstance() and issubclass() by 50-70%, so as to Antoine Pitrou <solipsis@pitrou.net> parents: 48693 diff changeset	2660 int
d6e86a96f9b3 Issue #2534: speed up isinstance() and issubclass() by 50-70%, so as to Antoine Pitrou <solipsis@pitrou.net> parents: 48693 diff changeset	2661 _PyObject_RealIsSubclass(PyObject derived, PyObject cls)
d6e86a96f9b3 Issue #2534: speed up isinstance() and issubclass() by 50-70%, so as to Antoine Pitrou <solipsis@pitrou.net> parents: 48693 diff changeset	2662 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2663 return recursive_issubclass(derived, cls);
31723 d69fb35f1eae Limit the nesting depth of a tuple passed as the second argument to Brett Cannon <bcannon@gmail.com> parents: 31676 diff changeset	2664 }
d69fb35f1eae Limit the nesting depth of a tuple passed as the second argument to Brett Cannon <bcannon@gmail.com> parents: 31676 diff changeset	2665
d69fb35f1eae Limit the nesting depth of a tuple passed as the second argument to Brett Cannon <bcannon@gmail.com> parents: 31676 diff changeset	2666
17597 32e7d0898eab Iterators phase 1. This comprises: Guido van Rossum <guido@python.org> parents: 17111 diff changeset	2667 PyObject *
32e7d0898eab Iterators phase 1. This comprises: Guido van Rossum <guido@python.org> parents: 17111 diff changeset	2668 PyObject_GetIter(PyObject *o)
32e7d0898eab Iterators phase 1. This comprises: Guido van Rossum <guido@python.org> parents: 17111 diff changeset	2669 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2670 PyTypeObject *t = o->ob_type;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2671 getiterfunc f = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2672 f = t->tp_iter;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2673 if (f == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2674 if (PySequence_Check(o))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2675 return PySeqIter_New(o);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2676 return type_error("'%.200s' object is not iterable", o);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2677 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2678 else {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2679 PyObject res = (f)(o);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2680 if (res != NULL && !PyIter_Check(res)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2681 PyErr_Format(PyExc_TypeError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2682 "iter() returned non-iterator "
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2683 "of type '%.100s'",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2684 res->ob_type->tp_name);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2685 Py_DECREF(res);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2686 res = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2687 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2688 return res;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2689 }
17597 32e7d0898eab Iterators phase 1. This comprises: Guido van Rossum <guido@python.org> parents: 17111 diff changeset	2690 }
17617 aac65f50df6f Mondo changes to the iterator stuff, without changing how Python code Guido van Rossum <guido@python.org> parents: 17597 diff changeset	2691
17683 e9a4e27e8d4e Make PyIter_Next() a little smarter (wrt its knowledge of iterator Tim Peters <tim.peters@gmail.com> parents: 17653 diff changeset	2692 /* Return next item.
e9a4e27e8d4e Make PyIter_Next() a little smarter (wrt its knowledge of iterator Tim Peters <tim.peters@gmail.com> parents: 17653 diff changeset	2693 * If an error occurs, return NULL. PyErr_Occurred() will be true.
e9a4e27e8d4e Make PyIter_Next() a little smarter (wrt its knowledge of iterator Tim Peters <tim.peters@gmail.com> parents: 17653 diff changeset	2694 * If the iteration terminates normally, return NULL and clear the
e9a4e27e8d4e Make PyIter_Next() a little smarter (wrt its knowledge of iterator Tim Peters <tim.peters@gmail.com> parents: 17653 diff changeset	2695 * PyExc_StopIteration exception (if it was set). PyErr_Occurred()
e9a4e27e8d4e Make PyIter_Next() a little smarter (wrt its knowledge of iterator Tim Peters <tim.peters@gmail.com> parents: 17653 diff changeset	2696 * will be false.
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2697 * Else return the next object. PyErr_Occurred() will be false.
17683 e9a4e27e8d4e Make PyIter_Next() a little smarter (wrt its knowledge of iterator Tim Peters <tim.peters@gmail.com> parents: 17653 diff changeset	2698 */
17617 aac65f50df6f Mondo changes to the iterator stuff, without changing how Python code Guido van Rossum <guido@python.org> parents: 17597 diff changeset	2699 PyObject *
aac65f50df6f Mondo changes to the iterator stuff, without changing how Python code Guido van Rossum <guido@python.org> parents: 17597 diff changeset	2700 PyIter_Next(PyObject *iter)
aac65f50df6f Mondo changes to the iterator stuff, without changing how Python code Guido van Rossum <guido@python.org> parents: 17597 diff changeset	2701 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2702 PyObject *result;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2703 result = (*iter->ob_type->tp_iternext)(iter);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2704 if (result == NULL &&
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2705 PyErr_Occurred() &&
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2706 PyErr_ExceptionMatches(PyExc_StopIteration))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2707 PyErr_Clear();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	2708 return result;
17617 aac65f50df6f Mondo changes to the iterator stuff, without changing how Python code Guido van Rossum <guido@python.org> parents: 17597 diff changeset	2709 }
59605 768722b2ae0a * Replaces the internals of the subprocess module from fork through exec on Gregory P. Smith <greg@mad-scientist.com> parents: 57678 diff changeset	2710
768722b2ae0a * Replaces the internals of the subprocess module from fork through exec on Gregory P. Smith <greg@mad-scientist.com> parents: 57678 diff changeset	2711
768722b2ae0a * Replaces the internals of the subprocess module from fork through exec on Gregory P. Smith <greg@mad-scientist.com> parents: 57678 diff changeset	2712 /*
768722b2ae0a * Replaces the internals of the subprocess module from fork through exec on Gregory P. Smith <greg@mad-scientist.com> parents: 57678 diff changeset	2713 * Flatten a sequence of bytes() objects into a C array of
768722b2ae0a * Replaces the internals of the subprocess module from fork through exec on Gregory P. Smith <greg@mad-scientist.com> parents: 57678 diff changeset	2714 * NULL terminated string pointers with a NULL char* terminating the array.
768722b2ae0a * Replaces the internals of the subprocess module from fork through exec on Gregory P. Smith <greg@mad-scientist.com> parents: 57678 diff changeset	2715 * (ie: an argv or env list)
768722b2ae0a * Replaces the internals of the subprocess module from fork through exec on Gregory P. Smith <greg@mad-scientist.com> parents: 57678 diff changeset	2716 *
768722b2ae0a * Replaces the internals of the subprocess module from fork through exec on Gregory P. Smith <greg@mad-scientist.com> parents: 57678 diff changeset	2717 * Memory allocated for the returned list is allocated using malloc() and MUST
768722b2ae0a * Replaces the internals of the subprocess module from fork through exec on Gregory P. Smith <greg@mad-scientist.com> parents: 57678 diff changeset	2718 * be freed by the caller using a free() loop or _Py_FreeCharPArray().
768722b2ae0a * Replaces the internals of the subprocess module from fork through exec on Gregory P. Smith <greg@mad-scientist.com> parents: 57678 diff changeset	2719 */
768722b2ae0a * Replaces the internals of the subprocess module from fork through exec on Gregory P. Smith <greg@mad-scientist.com> parents: 57678 diff changeset	2720 char const
768722b2ae0a * Replaces the internals of the subprocess module from fork through exec on Gregory P. Smith <greg@mad-scientist.com> parents: 57678 diff changeset	2721 _PySequence_BytesToCharpArray(PyObject* self)
768722b2ae0a * Replaces the internals of the subprocess module from fork through exec on Gregory P. Smith <greg@mad-scientist.com> parents: 57678 diff changeset	2722 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59631 diff changeset	2723 char **array;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59631 diff changeset	2724 Py_ssize_t i, argc;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59631 diff changeset	2725 PyObject *item = NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59631 diff changeset	2726
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59631 diff changeset	2727 argc = PySequence_Size(self);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59631 diff changeset	2728 if (argc == -1)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59631 diff changeset	2729 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59631 diff changeset	2730
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59631 diff changeset	2731 array = malloc((argc + 1) * sizeof(char *));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59631 diff changeset	2732 if (array == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59631 diff changeset	2733 PyErr_NoMemory();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59631 diff changeset	2734 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59631 diff changeset	2735 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59631 diff changeset	2736 for (i = 0; i < argc; ++i) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59631 diff changeset	2737 char *data;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59631 diff changeset	2738 item = PySequence_GetItem(self, i);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59631 diff changeset	2739 data = PyBytes_AsString(item);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59631 diff changeset	2740 if (data == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59631 diff changeset	2741 /* NULL terminate before freeing. */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59631 diff changeset	2742 array[i] = NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59631 diff changeset	2743 goto fail;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59631 diff changeset	2744 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59631 diff changeset	2745 array[i] = strdup(data);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59631 diff changeset	2746 if (!array[i]) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59631 diff changeset	2747 PyErr_NoMemory();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59631 diff changeset	2748 goto fail;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59631 diff changeset	2749 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59631 diff changeset	2750 Py_DECREF(item);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59631 diff changeset	2751 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59631 diff changeset	2752 array[argc] = NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59631 diff changeset	2753
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59631 diff changeset	2754 return array;
59605 768722b2ae0a * Replaces the internals of the subprocess module from fork through exec on Gregory P. Smith <greg@mad-scientist.com> parents: 57678 diff changeset	2755
768722b2ae0a * Replaces the internals of the subprocess module from fork through exec on Gregory P. Smith <greg@mad-scientist.com> parents: 57678 diff changeset	2756 fail:
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59631 diff changeset	2757 Py_XDECREF(item);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59631 diff changeset	2758 _Py_FreeCharPArray(array);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59631 diff changeset	2759 return NULL;
59605 768722b2ae0a * Replaces the internals of the subprocess module from fork through exec on Gregory P. Smith <greg@mad-scientist.com> parents: 57678 diff changeset	2760 }
768722b2ae0a * Replaces the internals of the subprocess module from fork through exec on Gregory P. Smith <greg@mad-scientist.com> parents: 57678 diff changeset	2761
768722b2ae0a * Replaces the internals of the subprocess module from fork through exec on Gregory P. Smith <greg@mad-scientist.com> parents: 57678 diff changeset	2762
768722b2ae0a * Replaces the internals of the subprocess module from fork through exec on Gregory P. Smith <greg@mad-scientist.com> parents: 57678 diff changeset	2763 /* Free's a NULL terminated char** array of C strings. */
768722b2ae0a * Replaces the internals of the subprocess module from fork through exec on Gregory P. Smith <greg@mad-scientist.com> parents: 57678 diff changeset	2764 void
768722b2ae0a * Replaces the internals of the subprocess module from fork through exec on Gregory P. Smith <greg@mad-scientist.com> parents: 57678 diff changeset	2765 _Py_FreeCharPArray(char *const array[])
768722b2ae0a * Replaces the internals of the subprocess module from fork through exec on Gregory P. Smith <greg@mad-scientist.com> parents: 57678 diff changeset	2766 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59631 diff changeset	2767 Py_ssize_t i;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59631 diff changeset	2768 for (i = 0; array[i] != NULL; ++i) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59631 diff changeset	2769 free(array[i]);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59631 diff changeset	2770 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59631 diff changeset	2771 free((void*)array);
59605 768722b2ae0a * Replaces the internals of the subprocess module from fork through exec on Gregory P. Smith <greg@mad-scientist.com> parents: 57678 diff changeset	2772 }

Mercurial > cpython-lru_cache-weakref

annotate Objects/abstract.c @ 78069:a8aa77458e12 3.2