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

annotate Objects/structseq.c @ 66978:aed2bbafa550 3.1

Blocked revisions 87324 via svnmerge ........ r87324 | r.david.murray | 2010-12-16 14:08:51 -0500 (Thu, 16 Dec 2010) | 9 lines #10719: restore messages generated on invalid compileall args Before the introduction of filename arguments to compileall it gave semi useful messages about not being able to 'list' names that weren't valid directories. This fix restores that behavior. In addition to the test for this case, the patch also adds a test for the default behavior of compileall when no arguments are provided, and fixes a bug in one of the previously added tests. ........

author	R. David Murray <rdmurray@bitdance.com>
date	Thu, 16 Dec 2010 19:10:16 +0000
parents	f197407bdba2
children	384f73a104e9

rev	line source
20540 ad2662095d77 Missing file structseq.c for SF patch #462296 Guido van Rossum <guido@python.org> parents: diff changeset	1 /* Implementation helper: a struct that looks like a tuple. See timemodule
ad2662095d77 Missing file structseq.c for SF patch #462296 Guido van Rossum <guido@python.org> parents: diff changeset	2 and posixmodule for example uses. */
ad2662095d77 Missing file structseq.c for SF patch #462296 Guido van Rossum <guido@python.org> parents: diff changeset	3
ad2662095d77 Missing file structseq.c for SF patch #462296 Guido van Rossum <guido@python.org> parents: diff changeset	4 #include "Python.h"
ad2662095d77 Missing file structseq.c for SF patch #462296 Guido van Rossum <guido@python.org> parents: diff changeset	5 #include "structmember.h"
ad2662095d77 Missing file structseq.c for SF patch #462296 Guido van Rossum <guido@python.org> parents: diff changeset	6 #include "structseq.h"
ad2662095d77 Missing file structseq.c for SF patch #462296 Guido van Rossum <guido@python.org> parents: diff changeset	7
ad2662095d77 Missing file structseq.c for SF patch #462296 Guido van Rossum <guido@python.org> parents: diff changeset	8 static char visible_length_key[] = "n_sequence_fields";
ad2662095d77 Missing file structseq.c for SF patch #462296 Guido van Rossum <guido@python.org> parents: diff changeset	9 static char real_length_key[] = "n_fields";
25808 fdca87c4234e Add n_unnamed_fields into the type. Martin v. Löwis <martin@v.loewis.de> parents: 25806 diff changeset	10 static char unnamed_fields_key[] = "n_unnamed_fields";
20540 ad2662095d77 Missing file structseq.c for SF patch #462296 Guido van Rossum <guido@python.org> parents: diff changeset	11
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	12 /* Fields with this name have only a field index, not a field name.
25806 0bbea4dcd9be Add PyStructSequence_UnnamedField. Add stat_float_times. Martin v. Löwis <martin@v.loewis.de> parents: 22978 diff changeset	13 They are only allowed for indices < n_visible_fields. */
0bbea4dcd9be Add PyStructSequence_UnnamedField. Add stat_float_times. Martin v. Löwis <martin@v.loewis.de> parents: 22978 diff changeset	14 char *PyStructSequence_UnnamedField = "unnamed field";
0bbea4dcd9be Add PyStructSequence_UnnamedField. Add stat_float_times. Martin v. Löwis <martin@v.loewis.de> parents: 22978 diff changeset	15
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	16 #define VISIBLE_SIZE(op) Py_SIZE(op)
44099 f324631462a2 Cleanup: Replaced most PyInt_ aliases with PyLong_ and disabled the aliases in intobject.h Christian Heimes <christian@cheimes.de> parents: 43100 diff changeset	17 #define VISIBLE_SIZE_TP(tp) PyLong_AsLong( \
20540 ad2662095d77 Missing file structseq.c for SF patch #462296 Guido van Rossum <guido@python.org> parents: diff changeset	18 PyDict_GetItemString((tp)->tp_dict, visible_length_key))
ad2662095d77 Missing file structseq.c for SF patch #462296 Guido van Rossum <guido@python.org> parents: diff changeset	19
44099 f324631462a2 Cleanup: Replaced most PyInt_ aliases with PyLong_ and disabled the aliases in intobject.h Christian Heimes <christian@cheimes.de> parents: 43100 diff changeset	20 #define REAL_SIZE_TP(tp) PyLong_AsLong( \
20540 ad2662095d77 Missing file structseq.c for SF patch #462296 Guido van Rossum <guido@python.org> parents: diff changeset	21 PyDict_GetItemString((tp)->tp_dict, real_length_key))
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	22 #define REAL_SIZE(op) REAL_SIZE_TP(Py_TYPE(op))
20540 ad2662095d77 Missing file structseq.c for SF patch #462296 Guido van Rossum <guido@python.org> parents: diff changeset	23
44099 f324631462a2 Cleanup: Replaced most PyInt_ aliases with PyLong_ and disabled the aliases in intobject.h Christian Heimes <christian@cheimes.de> parents: 43100 diff changeset	24 #define UNNAMED_FIELDS_TP(tp) PyLong_AsLong( \
25808 fdca87c4234e Add n_unnamed_fields into the type. Martin v. Löwis <martin@v.loewis.de> parents: 25806 diff changeset	25 PyDict_GetItemString((tp)->tp_dict, unnamed_fields_key))
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	26 #define UNNAMED_FIELDS(op) UNNAMED_FIELDS_TP(Py_TYPE(op))
25808 fdca87c4234e Add n_unnamed_fields into the type. Martin v. Löwis <martin@v.loewis.de> parents: 25806 diff changeset	27
20540 ad2662095d77 Missing file structseq.c for SF patch #462296 Guido van Rossum <guido@python.org> parents: diff changeset	28
ad2662095d77 Missing file structseq.c for SF patch #462296 Guido van Rossum <guido@python.org> parents: diff changeset	29 PyObject *
ad2662095d77 Missing file structseq.c for SF patch #462296 Guido van Rossum <guido@python.org> parents: diff changeset	30 PyStructSequence_New(PyTypeObject *type)
ad2662095d77 Missing file structseq.c for SF patch #462296 Guido van Rossum <guido@python.org> parents: diff changeset	31 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	32 PyStructSequence *obj;
44674 1154158a199f Merged revisions 59933-59951 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	33
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	34 obj = PyObject_New(PyStructSequence, type);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	35 if (obj == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	36 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	37 Py_SIZE(obj) = VISIBLE_SIZE_TP(type);
20540 ad2662095d77 Missing file structseq.c for SF patch #462296 Guido van Rossum <guido@python.org> parents: diff changeset	38
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	39 return (PyObject*) obj;
20540 ad2662095d77 Missing file structseq.c for SF patch #462296 Guido van Rossum <guido@python.org> parents: diff changeset	40 }
ad2662095d77 Missing file structseq.c for SF patch #462296 Guido van Rossum <guido@python.org> parents: diff changeset	41
ad2662095d77 Missing file structseq.c for SF patch #462296 Guido van Rossum <guido@python.org> parents: diff changeset	42 static void
ad2662095d77 Missing file structseq.c for SF patch #462296 Guido van Rossum <guido@python.org> parents: diff changeset	43 structseq_dealloc(PyStructSequence *obj)
ad2662095d77 Missing file structseq.c for SF patch #462296 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: 51271 diff changeset	45 Py_ssize_t i, size;
20540 ad2662095d77 Missing file structseq.c for SF patch #462296 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: 51271 diff changeset	47 size = REAL_SIZE(obj);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	48 for (i = 0; i < size; ++i) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	49 Py_XDECREF(obj->ob_item[i]);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	50 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	51 PyObject_Del(obj);
20540 ad2662095d77 Missing file structseq.c for SF patch #462296 Guido van Rossum <guido@python.org> parents: diff changeset	52 }
ad2662095d77 Missing file structseq.c for SF patch #462296 Guido van Rossum <guido@python.org> parents: diff changeset	53
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	54 static Py_ssize_t
20540 ad2662095d77 Missing file structseq.c for SF patch #462296 Guido van Rossum <guido@python.org> parents: diff changeset	55 structseq_length(PyStructSequence *obj)
ad2662095d77 Missing file structseq.c for SF patch #462296 Guido van Rossum <guido@python.org> parents: diff changeset	56 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	57 return VISIBLE_SIZE(obj);
20540 ad2662095d77 Missing file structseq.c for SF patch #462296 Guido van Rossum <guido@python.org> parents: diff changeset	58 }
ad2662095d77 Missing file structseq.c for SF patch #462296 Guido van Rossum <guido@python.org> parents: diff changeset	59
ad2662095d77 Missing file structseq.c for SF patch #462296 Guido van Rossum <guido@python.org> parents: diff changeset	60 static PyObject*
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	61 structseq_item(PyStructSequence *obj, Py_ssize_t i)
20540 ad2662095d77 Missing file structseq.c for SF patch #462296 Guido van Rossum <guido@python.org> parents: diff changeset	62 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	63 if (i < 0 \|\| i >= VISIBLE_SIZE(obj)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	64 PyErr_SetString(PyExc_IndexError, "tuple index out of range");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	65 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	66 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	67 Py_INCREF(obj->ob_item[i]);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	68 return obj->ob_item[i];
20540 ad2662095d77 Missing file structseq.c for SF patch #462296 Guido van Rossum <guido@python.org> parents: diff changeset	69 }
ad2662095d77 Missing file structseq.c for SF patch #462296 Guido van Rossum <guido@python.org> parents: diff changeset	70
ad2662095d77 Missing file structseq.c for SF patch #462296 Guido van Rossum <guido@python.org> parents: diff changeset	71 static PyObject*
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	72 structseq_slice(PyStructSequence *obj, Py_ssize_t low, Py_ssize_t high)
20540 ad2662095d77 Missing file structseq.c for SF patch #462296 Guido van Rossum <guido@python.org> parents: diff changeset	73 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	74 PyTupleObject *np;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	75 Py_ssize_t i;
20540 ad2662095d77 Missing file structseq.c for SF patch #462296 Guido van Rossum <guido@python.org> parents: diff changeset	76
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	77 if (low < 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	78 low = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	79 if (high > VISIBLE_SIZE(obj))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	80 high = VISIBLE_SIZE(obj);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	81 if (high < low)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	82 high = low;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	83 np = (PyTupleObject *)PyTuple_New(high-low);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	84 if (np == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	85 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	86 for(i = low; i < high; ++i) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	87 PyObject *v = obj->ob_item[i];
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	88 Py_INCREF(v);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	89 PyTuple_SET_ITEM(np, i-low, v);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	90 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	91 return (PyObject *) np;
20540 ad2662095d77 Missing file structseq.c for SF patch #462296 Guido van Rossum <guido@python.org> parents: diff changeset	92 }
ad2662095d77 Missing file structseq.c for SF patch #462296 Guido van Rossum <guido@python.org> parents: diff changeset	93
ad2662095d77 Missing file structseq.c for SF patch #462296 Guido van Rossum <guido@python.org> parents: diff changeset	94 static PyObject *
42954 27f0289b6835 Merge the trunk changes in. Breaks socket.ssl for now. Thomas Wouters <thomas@python.org> parents: 42334 diff changeset	95 structseq_subscript(PyStructSequence self, PyObject item)
27f0289b6835 Merge the trunk changes in. Breaks socket.ssl for now. Thomas Wouters <thomas@python.org> parents: 42334 diff changeset	96 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	97 if (PyIndex_Check(item)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	98 Py_ssize_t i = PyNumber_AsSsize_t(item, PyExc_IndexError);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	99 if (i == -1 && PyErr_Occurred())
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	100 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	101
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	102 if (i < 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	103 i += VISIBLE_SIZE(self);
42954 27f0289b6835 Merge the trunk changes in. Breaks socket.ssl for now. Thomas Wouters <thomas@python.org> parents: 42334 diff changeset	104
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	105 if (i < 0 \|\| i >= VISIBLE_SIZE(self)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	106 PyErr_SetString(PyExc_IndexError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	107 "tuple index out of range");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	108 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	109 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	110 Py_INCREF(self->ob_item[i]);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	111 return self->ob_item[i];
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	112 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	113 else if (PySlice_Check(item)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	114 Py_ssize_t start, stop, step, slicelen, cur, i;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	115 PyObject *result;
42954 27f0289b6835 Merge the trunk changes in. Breaks socket.ssl for now. Thomas Wouters <thomas@python.org> parents: 42334 diff changeset	116
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	117 if (PySlice_GetIndicesEx((PySliceObject *)item,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	118 VISIBLE_SIZE(self), &start, &stop,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	119 &step, &slicelen) < 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	120 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	121 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	122 if (slicelen <= 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	123 return PyTuple_New(0);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	124 result = PyTuple_New(slicelen);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	125 if (result == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	126 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	127 for (cur = start, i = 0; i < slicelen;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	128 cur += step, i++) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	129 PyObject *v = self->ob_item[cur];
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	130 Py_INCREF(v);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	131 PyTuple_SET_ITEM(result, i, v);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	132 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	133 return result;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	134 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	135 else {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	136 PyErr_SetString(PyExc_TypeError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	137 "structseq index must be integer");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	138 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	139 }
42954 27f0289b6835 Merge the trunk changes in. Breaks socket.ssl for now. Thomas Wouters <thomas@python.org> parents: 42334 diff changeset	140 }
27f0289b6835 Merge the trunk changes in. Breaks socket.ssl for now. Thomas Wouters <thomas@python.org> parents: 42334 diff changeset	141
27f0289b6835 Merge the trunk changes in. Breaks socket.ssl for now. Thomas Wouters <thomas@python.org> parents: 42334 diff changeset	142 static PyObject *
20540 ad2662095d77 Missing file structseq.c for SF patch #462296 Guido van Rossum <guido@python.org> parents: diff changeset	143 structseq_new(PyTypeObject type, PyObject args, PyObject *kwds)
ad2662095d77 Missing file structseq.c for SF patch #462296 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: 51271 diff changeset	145 PyObject *arg = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	146 PyObject *dict = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	147 PyObject *ob;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	148 PyStructSequence *res = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	149 Py_ssize_t len, min_len, max_len, i, n_unnamed_fields;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	150 static char *kwlist[] = {"sequence", "dict", 0};
20540 ad2662095d77 Missing file structseq.c for SF patch #462296 Guido van Rossum <guido@python.org> parents: diff changeset	151
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	152 if (!PyArg_ParseTupleAndKeywords(args, kwds, "O\|O:structseq",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	153 kwlist, &arg, &dict))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	154 return NULL;
20540 ad2662095d77 Missing file structseq.c for SF patch #462296 Guido van Rossum <guido@python.org> parents: diff changeset	155
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	156 arg = PySequence_Fast(arg, "constructor requires a sequence");
22166 837951ecdce9 After some thinking, I decided to move all of this across onto Michael W. Hudson <mwh@python.net> parents: 22137 diff changeset	157
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	158 if (!arg) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	159 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	160 }
22166 837951ecdce9 After some thinking, I decided to move all of this across onto Michael W. Hudson <mwh@python.net> parents: 22137 diff changeset	161
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	162 if (dict && !PyDict_Check(dict)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	163 PyErr_Format(PyExc_TypeError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	164 "%.500s() takes a dict as second arg, if any",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	165 type->tp_name);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	166 Py_DECREF(arg);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	167 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	168 }
20540 ad2662095d77 Missing file structseq.c for SF patch #462296 Guido van Rossum <guido@python.org> parents: diff changeset	169
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	170 len = PySequence_Fast_GET_SIZE(arg);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	171 min_len = VISIBLE_SIZE_TP(type);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	172 max_len = REAL_SIZE_TP(type);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	173 n_unnamed_fields = UNNAMED_FIELDS_TP(type);
22166 837951ecdce9 After some thinking, I decided to move all of this across onto Michael W. Hudson <mwh@python.net> parents: 22137 diff changeset	174
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	175 if (min_len != max_len) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	176 if (len < min_len) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	177 PyErr_Format(PyExc_TypeError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	178 "%.500s() takes an at least %zd-sequence (%zd-sequence given)",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	179 type->tp_name, min_len, len);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	180 Py_DECREF(arg);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	181 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	182 }
22166 837951ecdce9 After some thinking, I decided to move all of this across onto Michael W. Hudson <mwh@python.net> parents: 22137 diff changeset	183
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	184 if (len > max_len) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	185 PyErr_Format(PyExc_TypeError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	186 "%.500s() takes an at most %zd-sequence (%zd-sequence given)",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	187 type->tp_name, max_len, len);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	188 Py_DECREF(arg);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	189 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	190 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	191 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	192 else {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	193 if (len != min_len) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	194 PyErr_Format(PyExc_TypeError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	195 "%.500s() takes a %zd-sequence (%zd-sequence given)",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	196 type->tp_name, min_len, len);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	197 Py_DECREF(arg);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	198 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	199 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	200 }
20540 ad2662095d77 Missing file structseq.c for SF patch #462296 Guido van Rossum <guido@python.org> parents: diff changeset	201
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	202 res = (PyStructSequence*) PyStructSequence_New(type);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	203 if (res == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	204 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	205 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	206 for (i = 0; i < len; ++i) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	207 PyObject *v = PySequence_Fast_GET_ITEM(arg, i);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	208 Py_INCREF(v);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	209 res->ob_item[i] = v;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	210 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	211 for (; i < max_len; ++i) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	212 if (dict && (ob = PyDict_GetItemString(
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	213 dict, type->tp_members[i-n_unnamed_fields].name))) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	214 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	215 else {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	216 ob = Py_None;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	217 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	218 Py_INCREF(ob);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	219 res->ob_item[i] = ob;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	220 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	221
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	222 Py_DECREF(arg);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	223 return (PyObject*) res;
20540 ad2662095d77 Missing file structseq.c for SF patch #462296 Guido van Rossum <guido@python.org> parents: diff changeset	224 }
ad2662095d77 Missing file structseq.c for SF patch #462296 Guido van Rossum <guido@python.org> parents: diff changeset	225
ad2662095d77 Missing file structseq.c for SF patch #462296 Guido van Rossum <guido@python.org> parents: diff changeset	226 static PyObject *
ad2662095d77 Missing file structseq.c for SF patch #462296 Guido van Rossum <guido@python.org> parents: diff changeset	227 make_tuple(PyStructSequence *obj)
ad2662095d77 Missing file structseq.c for SF patch #462296 Guido van Rossum <guido@python.org> parents: diff changeset	228 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	229 return structseq_slice(obj, 0, VISIBLE_SIZE(obj));
20540 ad2662095d77 Missing file structseq.c for SF patch #462296 Guido van Rossum <guido@python.org> parents: diff changeset	230 }
ad2662095d77 Missing file structseq.c for SF patch #462296 Guido van Rossum <guido@python.org> parents: diff changeset	231
ad2662095d77 Missing file structseq.c for SF patch #462296 Guido van Rossum <guido@python.org> parents: diff changeset	232 static PyObject *
ad2662095d77 Missing file structseq.c for SF patch #462296 Guido van Rossum <guido@python.org> parents: diff changeset	233 structseq_repr(PyStructSequence *obj)
ad2662095d77 Missing file structseq.c for SF patch #462296 Guido van Rossum <guido@python.org> parents: diff changeset	234 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	235 /* buffer and type size were chosen well considered. */
44674 1154158a199f Merged revisions 59933-59951 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	236 #define REPR_BUFFER_SIZE 512
1154158a199f Merged revisions 59933-59951 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	237 #define TYPE_MAXSIZE 100
1154158a199f Merged revisions 59933-59951 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	238
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	239 PyObject *tup;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	240 PyTypeObject *typ = Py_TYPE(obj);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	241 int i, removelast = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	242 Py_ssize_t len;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	243 char buf[REPR_BUFFER_SIZE];
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	244 char endofbuf, pbuf = buf;
44674 1154158a199f Merged revisions 59933-59951 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	245
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	246 /* pointer to end of writeable buffer; safes space for "...)\0" */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	247 endofbuf= &buf[REPR_BUFFER_SIZE-5];
44674 1154158a199f Merged revisions 59933-59951 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	248
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	249 if ((tup = make_tuple(obj)) == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	250 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	251 }
44674 1154158a199f Merged revisions 59933-59951 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	252
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	253 /* "typename(", limited to TYPE_MAXSIZE */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	254 len = strlen(typ->tp_name) > TYPE_MAXSIZE ? TYPE_MAXSIZE :
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	255 strlen(typ->tp_name);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	256 strncpy(pbuf, typ->tp_name, len);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	257 pbuf += len;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	258 *pbuf++ = '(';
44674 1154158a199f Merged revisions 59933-59951 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	259
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	260 for (i=0; i < VISIBLE_SIZE(obj); i++) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	261 PyObject val, repr;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	262 char cname, crepr;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	263
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	264 cname = typ->tp_members[i].name;
44674 1154158a199f Merged revisions 59933-59951 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	265
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	266 val = PyTuple_GetItem(tup, i);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	267 if (cname == NULL \|\| val == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	268 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	269 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	270 repr = PyObject_Repr(val);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	271 if (repr == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	272 Py_DECREF(tup);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	273 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	274 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	275 crepr = _PyUnicode_AsString(repr);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	276 if (crepr == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	277 Py_DECREF(tup);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	278 Py_DECREF(repr);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	279 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	280 }
44674 1154158a199f Merged revisions 59933-59951 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	281
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	282 /* + 3: keep space for "=" and ", " */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	283 len = strlen(cname) + strlen(crepr) + 3;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	284 if ((pbuf+len) <= endofbuf) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	285 strcpy(pbuf, cname);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	286 pbuf += strlen(cname);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	287 *pbuf++ = '=';
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	288 strcpy(pbuf, crepr);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	289 pbuf += strlen(crepr);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	290 *pbuf++ = ',';
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	291 *pbuf++ = ' ';
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	292 removelast = 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	293 Py_DECREF(repr);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	294 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	295 else {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	296 strcpy(pbuf, "...");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	297 pbuf += 3;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	298 removelast = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	299 Py_DECREF(repr);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	300 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	301 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	302 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	303 Py_DECREF(tup);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	304 if (removelast) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	305 /* overwrite last ", " */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	306 pbuf-=2;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	307 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	308 *pbuf++ = ')';
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	309 *pbuf = '\0';
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	310
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	311 return PyUnicode_FromString(buf);
20540 ad2662095d77 Missing file structseq.c for SF patch #462296 Guido van Rossum <guido@python.org> parents: diff changeset	312 }
ad2662095d77 Missing file structseq.c for SF patch #462296 Guido van Rossum <guido@python.org> parents: diff changeset	313
ad2662095d77 Missing file structseq.c for SF patch #462296 Guido van Rossum <guido@python.org> parents: diff changeset	314 static PyObject *
ad2662095d77 Missing file structseq.c for SF patch #462296 Guido van Rossum <guido@python.org> parents: diff changeset	315 structseq_concat(PyStructSequence obj, PyObject b)
ad2662095d77 Missing file structseq.c for SF patch #462296 Guido van Rossum <guido@python.org> parents: diff changeset	316 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	317 PyObject tup, result;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	318 tup = make_tuple(obj);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	319 result = PySequence_Concat(tup, b);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	320 Py_DECREF(tup);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	321 return result;
20540 ad2662095d77 Missing file structseq.c for SF patch #462296 Guido van Rossum <guido@python.org> parents: diff changeset	322 }
ad2662095d77 Missing file structseq.c for SF patch #462296 Guido van Rossum <guido@python.org> parents: diff changeset	323
ad2662095d77 Missing file structseq.c for SF patch #462296 Guido van Rossum <guido@python.org> parents: diff changeset	324 static PyObject *
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	325 structseq_repeat(PyStructSequence *obj, Py_ssize_t n)
20540 ad2662095d77 Missing file structseq.c for SF patch #462296 Guido van Rossum <guido@python.org> parents: diff changeset	326 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	327 PyObject tup, result;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	328 tup = make_tuple(obj);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	329 result = PySequence_Repeat(tup, n);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	330 Py_DECREF(tup);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	331 return result;
20540 ad2662095d77 Missing file structseq.c for SF patch #462296 Guido van Rossum <guido@python.org> parents: diff changeset	332 }
ad2662095d77 Missing file structseq.c for SF patch #462296 Guido van Rossum <guido@python.org> parents: diff changeset	333
ad2662095d77 Missing file structseq.c for SF patch #462296 Guido van Rossum <guido@python.org> parents: diff changeset	334 static int
ad2662095d77 Missing file structseq.c for SF patch #462296 Guido van Rossum <guido@python.org> parents: diff changeset	335 structseq_contains(PyStructSequence obj, PyObject o)
ad2662095d77 Missing file structseq.c for SF patch #462296 Guido van Rossum <guido@python.org> parents: diff changeset	336 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	337 PyObject *tup;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	338 int result;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	339 tup = make_tuple(obj);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	340 if (!tup)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	341 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	342 result = PySequence_Contains(tup, o);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	343 Py_DECREF(tup);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	344 return result;
20540 ad2662095d77 Missing file structseq.c for SF patch #462296 Guido van Rossum <guido@python.org> parents: diff changeset	345 }
ad2662095d77 Missing file structseq.c for SF patch #462296 Guido van Rossum <guido@python.org> parents: diff changeset	346
ad2662095d77 Missing file structseq.c for SF patch #462296 Guido van Rossum <guido@python.org> parents: diff changeset	347 static long
ad2662095d77 Missing file structseq.c for SF patch #462296 Guido van Rossum <guido@python.org> parents: diff changeset	348 structseq_hash(PyObject *obj)
ad2662095d77 Missing file structseq.c for SF patch #462296 Guido van Rossum <guido@python.org> parents: diff changeset	349 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	350 PyObject *tup;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	351 long result;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	352 tup = make_tuple((PyStructSequence*) obj);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	353 if (!tup)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	354 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	355 result = PyObject_Hash(tup);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	356 Py_DECREF(tup);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	357 return result;
20540 ad2662095d77 Missing file structseq.c for SF patch #462296 Guido van Rossum <guido@python.org> parents: diff changeset	358 }
ad2662095d77 Missing file structseq.c for SF patch #462296 Guido van Rossum <guido@python.org> parents: diff changeset	359
ad2662095d77 Missing file structseq.c for SF patch #462296 Guido van Rossum <guido@python.org> parents: diff changeset	360 static PyObject *
ad2662095d77 Missing file structseq.c for SF patch #462296 Guido van Rossum <guido@python.org> parents: diff changeset	361 structseq_richcompare(PyObject obj, PyObject o2, int op)
ad2662095d77 Missing file structseq.c for SF patch #462296 Guido van Rossum <guido@python.org> parents: diff changeset	362 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	363 PyObject tup, result;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	364 tup = make_tuple((PyStructSequence*) obj);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	365 result = PyObject_RichCompare(tup, o2, op);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	366 Py_DECREF(tup);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	367 return result;
20540 ad2662095d77 Missing file structseq.c for SF patch #462296 Guido van Rossum <guido@python.org> parents: diff changeset	368 }
ad2662095d77 Missing file structseq.c for SF patch #462296 Guido van Rossum <guido@python.org> parents: diff changeset	369
22137 1a5110b4bd72 backport my checkin of Michael W. Hudson <mwh@python.net> parents: 21081 diff changeset	370 static PyObject *
1a5110b4bd72 backport my checkin of Michael W. Hudson <mwh@python.net> parents: 21081 diff changeset	371 structseq_reduce(PyStructSequence* self)
1a5110b4bd72 backport my checkin of Michael W. Hudson <mwh@python.net> parents: 21081 diff changeset	372 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	373 PyObject* tup;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	374 PyObject* dict;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	375 PyObject* result;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	376 Py_ssize_t n_fields, n_visible_fields, n_unnamed_fields;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	377 int i;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	378
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	379 n_fields = REAL_SIZE(self);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	380 n_visible_fields = VISIBLE_SIZE(self);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	381 n_unnamed_fields = UNNAMED_FIELDS(self);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	382 tup = PyTuple_New(n_visible_fields);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	383 if (!tup) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	384 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	385 }
22137 1a5110b4bd72 backport my checkin of Michael W. Hudson <mwh@python.net> parents: 21081 diff changeset	386
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	387 dict = PyDict_New();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	388 if (!dict) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	389 Py_DECREF(tup);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	390 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	391 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	392
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	393 for (i = 0; i < n_visible_fields; i++) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	394 Py_INCREF(self->ob_item[i]);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	395 PyTuple_SET_ITEM(tup, i, self->ob_item[i]);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	396 }
22166 837951ecdce9 After some thinking, I decided to move all of this across onto Michael W. Hudson <mwh@python.net> parents: 22137 diff changeset	397
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	398 for (; i < n_fields; i++) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	399 char *n = Py_TYPE(self)->tp_members[i-n_unnamed_fields].name;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	400 PyDict_SetItemString(dict, n,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	401 self->ob_item[i]);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	402 }
22166 837951ecdce9 After some thinking, I decided to move all of this across onto Michael W. Hudson <mwh@python.net> parents: 22137 diff changeset	403
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	404 result = Py_BuildValue("(O(OO))", Py_TYPE(self), tup, dict);
22168 68831ac5495b backport my checkin of Michael W. Hudson <mwh@python.net> parents: 22166 diff changeset	405
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	406 Py_DECREF(tup);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	407 Py_DECREF(dict);
22168 68831ac5495b backport my checkin of Michael W. Hudson <mwh@python.net> parents: 22166 diff changeset	408
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	409 return result;
22137 1a5110b4bd72 backport my checkin of Michael W. Hudson <mwh@python.net> parents: 21081 diff changeset	410 }
1a5110b4bd72 backport my checkin of Michael W. Hudson <mwh@python.net> parents: 21081 diff changeset	411
20540 ad2662095d77 Missing file structseq.c for SF patch #462296 Guido van Rossum <guido@python.org> parents: diff changeset	412 static PySequenceMethods structseq_as_sequence = {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	413 (lenfunc)structseq_length,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	414 (binaryfunc)structseq_concat, /* sq_concat */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	415 (ssizeargfunc)structseq_repeat, /* sq_repeat */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	416 (ssizeargfunc)structseq_item, /* sq_item */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	417 0, /* sq_slice */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	418 0, /* sq_ass_item */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	419 0, /* sq_ass_slice */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	420 (objobjproc)structseq_contains, /* sq_contains */
20540 ad2662095d77 Missing file structseq.c for SF patch #462296 Guido van Rossum <guido@python.org> parents: diff changeset	421 };
ad2662095d77 Missing file structseq.c for SF patch #462296 Guido van Rossum <guido@python.org> parents: diff changeset	422
42954 27f0289b6835 Merge the trunk changes in. Breaks socket.ssl for now. Thomas Wouters <thomas@python.org> parents: 42334 diff changeset	423 static PyMappingMethods structseq_as_mapping = {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	424 (lenfunc)structseq_length,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	425 (binaryfunc)structseq_subscript,
42954 27f0289b6835 Merge the trunk changes in. Breaks socket.ssl for now. Thomas Wouters <thomas@python.org> parents: 42334 diff changeset	426 };
27f0289b6835 Merge the trunk changes in. Breaks socket.ssl for now. Thomas Wouters <thomas@python.org> parents: 42334 diff changeset	427
22137 1a5110b4bd72 backport my checkin of Michael W. Hudson <mwh@python.net> parents: 21081 diff changeset	428 static PyMethodDef structseq_methods[] = {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	429 {"__reduce__", (PyCFunction)structseq_reduce,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	430 METH_NOARGS, NULL},
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	431 {NULL, NULL}
22137 1a5110b4bd72 backport my checkin of Michael W. Hudson <mwh@python.net> parents: 21081 diff changeset	432 };
1a5110b4bd72 backport my checkin of Michael W. Hudson <mwh@python.net> parents: 21081 diff changeset	433
20540 ad2662095d77 Missing file structseq.c for SF patch #462296 Guido van Rossum <guido@python.org> parents: diff changeset	434 static PyTypeObject _struct_sequence_template = {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	435 PyVarObject_HEAD_INIT(&PyType_Type, 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	436 NULL, /* tp_name */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	437 0, /* tp_basicsize */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	438 0, /* tp_itemsize */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	439 (destructor)structseq_dealloc, /* tp_dealloc */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	440 0, /* tp_print */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	441 0, /* tp_getattr */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	442 0, /* tp_setattr */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	443 0, /* tp_reserved */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	444 (reprfunc)structseq_repr, /* tp_repr */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	445 0, /* tp_as_number */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	446 &structseq_as_sequence, /* tp_as_sequence */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	447 &structseq_as_mapping, /* tp_as_mapping */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	448 structseq_hash, /* tp_hash */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	449 0, /* tp_call */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	450 0, /* tp_str */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	451 0, /* tp_getattro */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	452 0, /* tp_setattro */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	453 0, /* tp_as_buffer */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	454 Py_TPFLAGS_DEFAULT, /* tp_flags */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	455 NULL, /* tp_doc */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	456 0, /* tp_traverse */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	457 0, /* tp_clear */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	458 structseq_richcompare, /* tp_richcompare */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	459 0, /* tp_weaklistoffset */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	460 0, /* tp_iter */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	461 0, /* tp_iternext */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	462 structseq_methods, /* tp_methods */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	463 NULL, /* tp_members */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	464 0, /* tp_getset */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	465 0, /* tp_base */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	466 0, /* tp_dict */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	467 0, /* tp_descr_get */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	468 0, /* tp_descr_set */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	469 0, /* tp_dictoffset */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	470 0, /* tp_init */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	471 0, /* tp_alloc */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	472 structseq_new, /* tp_new */
20540 ad2662095d77 Missing file structseq.c for SF patch #462296 Guido van Rossum <guido@python.org> parents: diff changeset	473 };
ad2662095d77 Missing file structseq.c for SF patch #462296 Guido van Rossum <guido@python.org> parents: diff changeset	474
ad2662095d77 Missing file structseq.c for SF patch #462296 Guido van Rossum <guido@python.org> parents: diff changeset	475 void
ad2662095d77 Missing file structseq.c for SF patch #462296 Guido van Rossum <guido@python.org> parents: diff changeset	476 PyStructSequence_InitType(PyTypeObject type, PyStructSequence_Desc desc)
ad2662095d77 Missing file structseq.c for SF patch #462296 Guido van Rossum <guido@python.org> parents: diff changeset	477 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	478 PyObject *dict;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	479 PyMemberDef* members;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	480 int n_members, n_unnamed_members, i, k;
20540 ad2662095d77 Missing file structseq.c for SF patch #462296 Guido van Rossum <guido@python.org> parents: diff changeset	481
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36675 diff changeset	482 #ifdef Py_TRACE_REFS
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	483 /* if the type object was chained, unchain it first
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	484 before overwriting its storage */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	485 if (type->ob_base.ob_base._ob_next) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	486 _Py_ForgetReference((PyObject*)type);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	487 }
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36675 diff changeset	488 #endif
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36675 diff changeset	489
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	490 n_unnamed_members = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	491 for (i = 0; desc->fields[i].name != NULL; ++i)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	492 if (desc->fields[i].name == PyStructSequence_UnnamedField)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	493 n_unnamed_members++;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	494 n_members = i;
20540 ad2662095d77 Missing file structseq.c for SF patch #462296 Guido van Rossum <guido@python.org> parents: diff changeset	495
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	496 memcpy(type, &_struct_sequence_template, sizeof(PyTypeObject));
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	497 type->tp_name = desc->name;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	498 type->tp_doc = desc->doc;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	499 type->tp_basicsize = sizeof(PyStructSequence)+
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	500 sizeof(PyObject)(n_members-1);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	501 type->tp_itemsize = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	502
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	503 members = PyMem_NEW(PyMemberDef, n_members-n_unnamed_members+1);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	504 if (members == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	505 return;
20540 ad2662095d77 Missing file structseq.c for SF patch #462296 Guido van Rossum <guido@python.org> parents: diff changeset	506
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	507 for (i = k = 0; i < n_members; ++i) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	508 if (desc->fields[i].name == PyStructSequence_UnnamedField)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	509 continue;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	510 members[k].name = desc->fields[i].name;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	511 members[k].type = T_OBJECT;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	512 members[k].offset = offsetof(PyStructSequence, ob_item)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	513 + i * sizeof(PyObject*);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	514 members[k].flags = READONLY;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	515 members[k].doc = desc->fields[i].doc;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	516 k++;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	517 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	518 members[k].name = NULL;
20540 ad2662095d77 Missing file structseq.c for SF patch #462296 Guido van Rossum <guido@python.org> parents: diff changeset	519
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	520 type->tp_members = members;
20540 ad2662095d77 Missing file structseq.c for SF patch #462296 Guido van Rossum <guido@python.org> parents: diff changeset	521
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	522 if (PyType_Ready(type) < 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	523 return;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	524 Py_INCREF(type);
20540 ad2662095d77 Missing file structseq.c for SF patch #462296 Guido van Rossum <guido@python.org> parents: diff changeset	525
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	526 dict = type->tp_dict;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	527 #define SET_DICT_FROM_INT(key, value) \
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	528 do { \
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	529 PyObject *v = PyLong_FromLong((long) value); \
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	530 if (v != NULL) { \
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	531 PyDict_SetItemString(dict, key, v); \
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	532 Py_DECREF(v); \
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	533 } \
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	534 } while (0)
48848 5c75a33ef5b2 Merged revisions 66006 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 48660 diff changeset	535
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	536 SET_DICT_FROM_INT(visible_length_key, desc->n_in_sequence);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	537 SET_DICT_FROM_INT(real_length_key, n_members);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	538 SET_DICT_FROM_INT(unnamed_fields_key, n_unnamed_members);
20540 ad2662095d77 Missing file structseq.c for SF patch #462296 Guido van Rossum <guido@python.org> parents: diff changeset	539 }

Mercurial > cpython-lru_cache-weakref

annotate Objects/structseq.c @ 66978:aed2bbafa550 3.1