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

annotate Modules/arraymodule.c @ 65105:8bcbdd6730a7

#10034: import readline in longer example.

author	Georg Brandl <georg@python.org>
date	Wed, 06 Oct 2010 05:08:32 +0000
parents	fa8b57f987c5
children	646dfdc48ca8

rev	line source
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	1 /* Array object implementation */
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	2
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	3 /* An array is a uniform list -- all items have the same type.
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	4 The item type is restricted to simple C types like int or float */
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	5
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36324 diff changeset	6 #define PY_SSIZE_T_CLEAN
4628 7df5d4cf8277 Renamed Grandly (I think). Roger E. Masse <rmasse@newcnri.cnri.reston.va.us> parents: 4600 diff changeset	7 #include "Python.h"
32159 2c169ca5fa69 Add weakref support to array.array and file objects. Raymond Hettinger <python@rcn.com> parents: 31660 diff changeset	8 #include "structmember.h"
4634 9facbab152cd Removed some unneeded header files and reedited with a fixed-width font Roger E. Masse <rmasse@newcnri.cnri.reston.va.us> parents: 4628 diff changeset	9
1797 b167e3350491 Changes for Mac Guido van Rossum <guido@python.org> parents: 1746 diff changeset	10 #ifdef STDC_HEADERS
b167e3350491 Changes for Mac Guido van Rossum <guido@python.org> parents: 1746 diff changeset	11 #include <stddef.h>
11242 0061ca4865d7 Tiny patch by Mark Hammond to avoid sys/types.h if we don't have it Guido van Rossum <guido@python.org> parents: 10434 diff changeset	12 #else /* !STDC_HEADERS */
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	13 #ifdef HAVE_SYS_TYPES_H
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	14 #include <sys/types.h> /* For size_t */
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	15 #endif /* HAVE_SYS_TYPES_H */
11242 0061ca4865d7 Tiny patch by Mark Hammond to avoid sys/types.h if we don't have it Guido van Rossum <guido@python.org> parents: 10434 diff changeset	16 #endif /* !STDC_HEADERS */
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	17
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	18 struct arrayobject; /* Forward */
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	19
14499 7f23ec5cd9ca General cleanup in preparation for a bugfix: removed unused code, useless Tim Peters <tim.peters@gmail.com> parents: 14375 diff changeset	20 /* All possible arraydescr values are defined in the vector "descriptors"
7f23ec5cd9ca General cleanup in preparation for a bugfix: removed unused code, useless Tim Peters <tim.peters@gmail.com> parents: 14375 diff changeset	21 * below. That's defined later because the appropriate get and set
7f23ec5cd9ca General cleanup in preparation for a bugfix: removed unused code, useless Tim Peters <tim.peters@gmail.com> parents: 14375 diff changeset	22 * functions aren't visible yet.
7f23ec5cd9ca General cleanup in preparation for a bugfix: removed unused code, useless Tim Peters <tim.peters@gmail.com> parents: 14375 diff changeset	23 */
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	24 struct arraydescr {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	25 int typecode;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	26 int itemsize;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	27 PyObject * (getitem)(struct arrayobject , Py_ssize_t);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	28 int (setitem)(struct arrayobject , Py_ssize_t, PyObject *);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	29 char *formats;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	30 int is_integer_type;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	31 int is_signed;
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	32 };
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	33
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	34 typedef struct arrayobject {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	35 PyObject_VAR_HEAD
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	36 char *ob_item;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	37 Py_ssize_t allocated;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	38 struct arraydescr *ob_descr;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	39 PyObject weakreflist; / List of weak references */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	40 int ob_exports; /* Number of exported buffers */
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	41 } arrayobject;
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	42
24280 1598a1e473e2 staticforward bites the dust. Jeremy Hylton <jeremy@alum.mit.edu> parents: 23929 diff changeset	43 static PyTypeObject Arraytype;
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	44
22098 966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	45 #define array_Check(op) PyObject_TypeCheck(op, &Arraytype)
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	46 #define array_CheckExact(op) (Py_TYPE(op) == &Arraytype)
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	47
31659 206d8575f644 Update the array overallocation scheme to match the approach used for Raymond Hettinger <python@rcn.com> parents: 31651 diff changeset	48 static int
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36324 diff changeset	49 array_resize(arrayobject *self, Py_ssize_t newsize)
31659 206d8575f644 Update the array overallocation scheme to match the approach used for Raymond Hettinger <python@rcn.com> parents: 31651 diff changeset	50 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	51 char *items;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	52 size_t _new_size;
31659 206d8575f644 Update the array overallocation scheme to match the approach used for Raymond Hettinger <python@rcn.com> parents: 31651 diff changeset	53
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	54 if (self->ob_exports > 0 && newsize != Py_SIZE(self)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	55 PyErr_SetString(PyExc_BufferError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	56 "cannot resize an array that is exporting buffers");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	57 return -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	58 }
50214 aebf7124dd32 Merged revisions 67840 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 48683 diff changeset	59
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	60 /* Bypass realloc() when a previous overallocation is large enough
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	61 to accommodate the newsize. If the newsize is 16 smaller than the
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	62 current size, then proceed with the realloc() to shrink the array.
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	63 */
31659 206d8575f644 Update the array overallocation scheme to match the approach used for Raymond Hettinger <python@rcn.com> parents: 31651 diff changeset	64
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	65 if (self->allocated >= newsize &&
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	66 Py_SIZE(self) < newsize + 16 &&
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	67 self->ob_item != NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	68 Py_SIZE(self) = newsize;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	69 return 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	70 }
31659 206d8575f644 Update the array overallocation scheme to match the approach used for Raymond Hettinger <python@rcn.com> parents: 31651 diff changeset	71
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	72 if (newsize == 0) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	73 PyMem_FREE(self->ob_item);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	74 self->ob_item = NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	75 Py_SIZE(self) = 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	76 self->allocated = 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	77 return 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	78 }
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: 42540 diff changeset	79
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	80 /* This over-allocates proportional to the array size, making room
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	81 * for additional growth. The over-allocation is mild, but is
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	82 * enough to give linear-time amortized behavior over a long
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	83 * sequence of appends() in the presence of a poorly-performing
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	84 * system realloc().
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	85 * The growth pattern is: 0, 4, 8, 16, 25, 34, 46, 56, 67, 79, ...
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	86 * Note, the pattern starts out the same as for lists but then
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	87 * grows at a smaller rate so that larger arrays only overallocate
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	88 * by about 1/16th -- this is done because arrays are presumed to be more
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	89 * memory critical.
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	90 */
31659 206d8575f644 Update the array overallocation scheme to match the approach used for Raymond Hettinger <python@rcn.com> parents: 31651 diff changeset	91
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	92 _new_size = (newsize >> 4) + (Py_SIZE(self) < 8 ? 3 : 7) + newsize;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	93 items = self->ob_item;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	94 /* XXX The following multiplication and division does not optimize away
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	95 like it does for lists since the size is not known at compile time */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	96 if (_new_size <= ((~(size_t)0) / self->ob_descr->itemsize))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	97 PyMem_RESIZE(items, char, (_new_size * self->ob_descr->itemsize));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	98 else
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	99 items = NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	100 if (items == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	101 PyErr_NoMemory();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	102 return -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	103 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	104 self->ob_item = items;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	105 Py_SIZE(self) = newsize;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	106 self->allocated = _new_size;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	107 return 0;
31659 206d8575f644 Update the array overallocation scheme to match the approach used for Raymond Hettinger <python@rcn.com> parents: 31651 diff changeset	108 }
206d8575f644 Update the array overallocation scheme to match the approach used for Raymond Hettinger <python@rcn.com> parents: 31651 diff changeset	109
14499 7f23ec5cd9ca General cleanup in preparation for a bugfix: removed unused code, useless Tim Peters <tim.peters@gmail.com> parents: 14375 diff changeset	110 /****************************************************************************
7f23ec5cd9ca General cleanup in preparation for a bugfix: removed unused code, useless Tim Peters <tim.peters@gmail.com> parents: 14375 diff changeset	111 Get and Set functions for each type.
7f23ec5cd9ca General cleanup in preparation for a bugfix: removed unused code, useless Tim Peters <tim.peters@gmail.com> parents: 14375 diff changeset	112 A Get function takes an arrayobject* and an integer index, returning the
7f23ec5cd9ca General cleanup in preparation for a bugfix: removed unused code, useless Tim Peters <tim.peters@gmail.com> parents: 14375 diff changeset	113 array value at that index wrapped in an appropriate PyObject*.
7f23ec5cd9ca General cleanup in preparation for a bugfix: removed unused code, useless Tim Peters <tim.peters@gmail.com> parents: 14375 diff changeset	114 A Set function takes an arrayobject, integer index, and PyObject*; sets
7f23ec5cd9ca General cleanup in preparation for a bugfix: removed unused code, useless Tim Peters <tim.peters@gmail.com> parents: 14375 diff changeset	115 the array value at that index to the raw C data extracted from the PyObject*,
7f23ec5cd9ca General cleanup in preparation for a bugfix: removed unused code, useless Tim Peters <tim.peters@gmail.com> parents: 14375 diff changeset	116 and returns 0 if successful, else nonzero on failure (PyObject* not of an
7f23ec5cd9ca General cleanup in preparation for a bugfix: removed unused code, useless Tim Peters <tim.peters@gmail.com> parents: 14375 diff changeset	117 appropriate type or value).
7f23ec5cd9ca General cleanup in preparation for a bugfix: removed unused code, useless Tim Peters <tim.peters@gmail.com> parents: 14375 diff changeset	118 Note that the basic Get and Set functions do NOT check that the index is
7f23ec5cd9ca General cleanup in preparation for a bugfix: removed unused code, useless Tim Peters <tim.peters@gmail.com> parents: 14375 diff changeset	119 in bounds; that's the responsibility of the caller.
7f23ec5cd9ca General cleanup in preparation for a bugfix: removed unused code, useless Tim Peters <tim.peters@gmail.com> parents: 14375 diff changeset	120 ****************************************************************************/
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	121
4628 7df5d4cf8277 Renamed Grandly (I think). Roger E. Masse <rmasse@newcnri.cnri.reston.va.us> parents: 4600 diff changeset	122 static PyObject *
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36324 diff changeset	123 b_getitem(arrayobject *ap, Py_ssize_t i)
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	124 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	125 long x = ((char *)ap->ob_item)[i];
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	126 if (x >= 128)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	127 x -= 256;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	128 return PyLong_FromLong(x);
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	129 }
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	130
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	131 static int
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36324 diff changeset	132 b_setitem(arrayobject ap, Py_ssize_t i, PyObject v)
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	133 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	134 short x;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	135 /* PyArg_Parse's 'b' formatter is for an unsigned char, therefore
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	136 must use the next size up that is signed ('h') and manually do
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	137 the overflow checking */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	138 if (!PyArg_Parse(v, "h;array item must be integer", &x))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	139 return -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	140 else if (x < -128) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	141 PyErr_SetString(PyExc_OverflowError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	142 "signed char is less than minimum");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	143 return -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	144 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	145 else if (x > 127) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	146 PyErr_SetString(PyExc_OverflowError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	147 "signed char is greater than maximum");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	148 return -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	149 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	150 if (i >= 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	151 ((char *)ap->ob_item)[i] = (char)x;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	152 return 0;
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	153 }
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	154
4628 7df5d4cf8277 Renamed Grandly (I think). Roger E. Masse <rmasse@newcnri.cnri.reston.va.us> parents: 4600 diff changeset	155 static PyObject *
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36324 diff changeset	156 BB_getitem(arrayobject *ap, Py_ssize_t i)
4875 911040e1bb11 Add new formats B, H, I, L for unsigned data types (analogous to the Guido van Rossum <guido@python.org> parents: 4634 diff changeset	157 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	158 long x = ((unsigned char *)ap->ob_item)[i];
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	159 return PyLong_FromLong(x);
4875 911040e1bb11 Add new formats B, H, I, L for unsigned data types (analogous to the Guido van Rossum <guido@python.org> parents: 4634 diff changeset	160 }
911040e1bb11 Add new formats B, H, I, L for unsigned data types (analogous to the Guido van Rossum <guido@python.org> parents: 4634 diff changeset	161
13068 705132667f7b Trent Mick <trentm@activestate.com>: Fred Drake <fdrake@acm.org> parents: 12814 diff changeset	162 static int
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36324 diff changeset	163 BB_setitem(arrayobject ap, Py_ssize_t i, PyObject v)
13068 705132667f7b Trent Mick <trentm@activestate.com>: Fred Drake <fdrake@acm.org> parents: 12814 diff changeset	164 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	165 unsigned char x;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	166 /* 'B' == unsigned char, maps to PyArg_Parse's 'b' formatter */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	167 if (!PyArg_Parse(v, "b;array item must be integer", &x))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	168 return -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	169 if (i >= 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	170 ((char *)ap->ob_item)[i] = x;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	171 return 0;
13068 705132667f7b Trent Mick <trentm@activestate.com>: Fred Drake <fdrake@acm.org> parents: 12814 diff changeset	172 }
4875 911040e1bb11 Add new formats B, H, I, L for unsigned data types (analogous to the Guido van Rossum <guido@python.org> parents: 4634 diff changeset	173
22098 966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	174 static PyObject *
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36324 diff changeset	175 u_getitem(arrayobject *ap, Py_ssize_t i)
22098 966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	176 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	177 return PyUnicode_FromUnicode(&((Py_UNICODE *) ap->ob_item)[i], 1);
22098 966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	178 }
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	179
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	180 static int
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36324 diff changeset	181 u_setitem(arrayobject ap, Py_ssize_t i, PyObject v)
22098 966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	182 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	183 Py_UNICODE *p;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	184 Py_ssize_t len;
22098 966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	185
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	186 if (!PyArg_Parse(v, "u#;array item must be unicode character", &p, &len))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	187 return -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	188 if (len != 1) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	189 PyErr_SetString(PyExc_TypeError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	190 "array item must be unicode character");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	191 return -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	192 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	193 if (i >= 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	194 ((Py_UNICODE *)ap->ob_item)[i] = p[0];
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	195 return 0;
22098 966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	196 }
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	197
43548 fb9d5306f4c7 Fix Issue 1268 with the array module by backing-out the 'w' addition. All builds will continue to use 'u' for unicode. Travis E. Oliphant <oliphant@enthought.com> parents: 43423 diff changeset	198
4875 911040e1bb11 Add new formats B, H, I, L for unsigned data types (analogous to the Guido van Rossum <guido@python.org> parents: 4634 diff changeset	199 static PyObject *
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36324 diff changeset	200 h_getitem(arrayobject *ap, Py_ssize_t i)
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	201 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	202 return PyLong_FromLong((long) ((short *)ap->ob_item)[i]);
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	203 }
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	204
43548 fb9d5306f4c7 Fix Issue 1268 with the array module by backing-out the 'w' addition. All builds will continue to use 'u' for unicode. Travis E. Oliphant <oliphant@enthought.com> parents: 43423 diff changeset	205
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	206 static int
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36324 diff changeset	207 h_setitem(arrayobject ap, Py_ssize_t i, PyObject v)
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	208 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	209 short x;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	210 /* 'h' == signed short, maps to PyArg_Parse's 'h' formatter */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	211 if (!PyArg_Parse(v, "h;array item must be integer", &x))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	212 return -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	213 if (i >= 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	214 ((short *)ap->ob_item)[i] = x;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	215 return 0;
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	216 }
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	217
4628 7df5d4cf8277 Renamed Grandly (I think). Roger E. Masse <rmasse@newcnri.cnri.reston.va.us> parents: 4600 diff changeset	218 static PyObject *
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36324 diff changeset	219 HH_getitem(arrayobject *ap, Py_ssize_t i)
4875 911040e1bb11 Add new formats B, H, I, L for unsigned data types (analogous to the Guido van Rossum <guido@python.org> parents: 4634 diff changeset	220 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	221 return PyLong_FromLong((long) ((unsigned short *)ap->ob_item)[i]);
4875 911040e1bb11 Add new formats B, H, I, L for unsigned data types (analogous to the Guido van Rossum <guido@python.org> parents: 4634 diff changeset	222 }
911040e1bb11 Add new formats B, H, I, L for unsigned data types (analogous to the Guido van Rossum <guido@python.org> parents: 4634 diff changeset	223
13068 705132667f7b Trent Mick <trentm@activestate.com>: Fred Drake <fdrake@acm.org> parents: 12814 diff changeset	224 static int
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36324 diff changeset	225 HH_setitem(arrayobject ap, Py_ssize_t i, PyObject v)
13068 705132667f7b Trent Mick <trentm@activestate.com>: Fred Drake <fdrake@acm.org> parents: 12814 diff changeset	226 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	227 int x;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	228 /* PyArg_Parse's 'h' formatter is for a signed short, therefore
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	229 must use the next size up and manually do the overflow checking */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	230 if (!PyArg_Parse(v, "i;array item must be integer", &x))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	231 return -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	232 else if (x < 0) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	233 PyErr_SetString(PyExc_OverflowError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	234 "unsigned short is less than minimum");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	235 return -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	236 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	237 else if (x > USHRT_MAX) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	238 PyErr_SetString(PyExc_OverflowError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	239 "unsigned short is greater than maximum");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	240 return -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	241 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	242 if (i >= 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	243 ((short *)ap->ob_item)[i] = (short)x;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	244 return 0;
13068 705132667f7b Trent Mick <trentm@activestate.com>: Fred Drake <fdrake@acm.org> parents: 12814 diff changeset	245 }
4875 911040e1bb11 Add new formats B, H, I, L for unsigned data types (analogous to the Guido van Rossum <guido@python.org> parents: 4634 diff changeset	246
911040e1bb11 Add new formats B, H, I, L for unsigned data types (analogous to the Guido van Rossum <guido@python.org> parents: 4634 diff changeset	247 static PyObject *
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36324 diff changeset	248 i_getitem(arrayobject *ap, Py_ssize_t i)
1393 7d6a2d950f13 * nismodule.c: database keys and values can contain null bytes. be more Guido van Rossum <guido@python.org> parents: 1391 diff changeset	249 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	250 return PyLong_FromLong((long) ((int *)ap->ob_item)[i]);
1393 7d6a2d950f13 * nismodule.c: database keys and values can contain null bytes. be more Guido van Rossum <guido@python.org> parents: 1391 diff changeset	251 }
7d6a2d950f13 * nismodule.c: database keys and values can contain null bytes. be more Guido van Rossum <guido@python.org> parents: 1391 diff changeset	252
7d6a2d950f13 * nismodule.c: database keys and values can contain null bytes. be more Guido van Rossum <guido@python.org> parents: 1391 diff changeset	253 static int
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36324 diff changeset	254 i_setitem(arrayobject ap, Py_ssize_t i, PyObject v)
1393 7d6a2d950f13 * nismodule.c: database keys and values can contain null bytes. be more Guido van Rossum <guido@python.org> parents: 1391 diff changeset	255 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	256 int x;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	257 /* 'i' == signed int, maps to PyArg_Parse's 'i' formatter */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	258 if (!PyArg_Parse(v, "i;array item must be integer", &x))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	259 return -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	260 if (i >= 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	261 ((int *)ap->ob_item)[i] = x;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	262 return 0;
1393 7d6a2d950f13 * nismodule.c: database keys and values can contain null bytes. be more Guido van Rossum <guido@python.org> parents: 1391 diff changeset	263 }
7d6a2d950f13 * nismodule.c: database keys and values can contain null bytes. be more Guido van Rossum <guido@python.org> parents: 1391 diff changeset	264
4628 7df5d4cf8277 Renamed Grandly (I think). Roger E. Masse <rmasse@newcnri.cnri.reston.va.us> parents: 4600 diff changeset	265 static PyObject *
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36324 diff changeset	266 II_getitem(arrayobject *ap, Py_ssize_t i)
4875 911040e1bb11 Add new formats B, H, I, L for unsigned data types (analogous to the Guido van Rossum <guido@python.org> parents: 4634 diff changeset	267 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	268 return PyLong_FromUnsignedLong(
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	269 (unsigned long) ((unsigned int *)ap->ob_item)[i]);
4875 911040e1bb11 Add new formats B, H, I, L for unsigned data types (analogous to the Guido van Rossum <guido@python.org> parents: 4634 diff changeset	270 }
911040e1bb11 Add new formats B, H, I, L for unsigned data types (analogous to the Guido van Rossum <guido@python.org> parents: 4634 diff changeset	271
911040e1bb11 Add new formats B, H, I, L for unsigned data types (analogous to the Guido van Rossum <guido@python.org> parents: 4634 diff changeset	272 static int
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36324 diff changeset	273 II_setitem(arrayobject ap, Py_ssize_t i, PyObject v)
4875 911040e1bb11 Add new formats B, H, I, L for unsigned data types (analogous to the Guido van Rossum <guido@python.org> parents: 4634 diff changeset	274 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	275 unsigned long x;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	276 if (PyLong_Check(v)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	277 x = PyLong_AsUnsignedLong(v);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	278 if (x == (unsigned long) -1 && PyErr_Occurred())
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	279 return -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	280 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	281 else {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	282 long y;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	283 if (!PyArg_Parse(v, "l;array item must be integer", &y))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	284 return -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	285 if (y < 0) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	286 PyErr_SetString(PyExc_OverflowError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	287 "unsigned int is less than minimum");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	288 return -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	289 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	290 x = (unsigned long)y;
14499 7f23ec5cd9ca General cleanup in preparation for a bugfix: removed unused code, useless Tim Peters <tim.peters@gmail.com> parents: 14375 diff changeset	291
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	292 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	293 if (x > UINT_MAX) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	294 PyErr_SetString(PyExc_OverflowError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	295 "unsigned int is greater than maximum");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	296 return -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	297 }
13068 705132667f7b Trent Mick <trentm@activestate.com>: Fred Drake <fdrake@acm.org> parents: 12814 diff changeset	298
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	299 if (i >= 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	300 ((unsigned int *)ap->ob_item)[i] = (unsigned int)x;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	301 return 0;
4875 911040e1bb11 Add new formats B, H, I, L for unsigned data types (analogous to the Guido van Rossum <guido@python.org> parents: 4634 diff changeset	302 }
911040e1bb11 Add new formats B, H, I, L for unsigned data types (analogous to the Guido van Rossum <guido@python.org> parents: 4634 diff changeset	303
911040e1bb11 Add new formats B, H, I, L for unsigned data types (analogous to the Guido van Rossum <guido@python.org> parents: 4634 diff changeset	304 static PyObject *
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36324 diff changeset	305 l_getitem(arrayobject *ap, Py_ssize_t i)
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	306 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	307 return PyLong_FromLong(((long *)ap->ob_item)[i]);
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	308 }
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	309
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	310 static int
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36324 diff changeset	311 l_setitem(arrayobject ap, Py_ssize_t i, PyObject v)
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	312 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	313 long x;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	314 if (!PyArg_Parse(v, "l;array item must be integer", &x))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	315 return -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	316 if (i >= 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	317 ((long *)ap->ob_item)[i] = x;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	318 return 0;
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	319 }
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	320
4628 7df5d4cf8277 Renamed Grandly (I think). Roger E. Masse <rmasse@newcnri.cnri.reston.va.us> parents: 4600 diff changeset	321 static PyObject *
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36324 diff changeset	322 LL_getitem(arrayobject *ap, Py_ssize_t i)
4875 911040e1bb11 Add new formats B, H, I, L for unsigned data types (analogous to the Guido van Rossum <guido@python.org> parents: 4634 diff changeset	323 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	324 return PyLong_FromUnsignedLong(((unsigned long *)ap->ob_item)[i]);
4875 911040e1bb11 Add new formats B, H, I, L for unsigned data types (analogous to the Guido van Rossum <guido@python.org> parents: 4634 diff changeset	325 }
911040e1bb11 Add new formats B, H, I, L for unsigned data types (analogous to the Guido van Rossum <guido@python.org> parents: 4634 diff changeset	326
911040e1bb11 Add new formats B, H, I, L for unsigned data types (analogous to the Guido van Rossum <guido@python.org> parents: 4634 diff changeset	327 static int
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36324 diff changeset	328 LL_setitem(arrayobject ap, Py_ssize_t i, PyObject v)
4875 911040e1bb11 Add new formats B, H, I, L for unsigned data types (analogous to the Guido van Rossum <guido@python.org> parents: 4634 diff changeset	329 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	330 unsigned long x;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	331 if (PyLong_Check(v)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	332 x = PyLong_AsUnsignedLong(v);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	333 if (x == (unsigned long) -1 && PyErr_Occurred())
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	334 return -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	335 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	336 else {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	337 long y;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	338 if (!PyArg_Parse(v, "l;array item must be integer", &y))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	339 return -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	340 if (y < 0) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	341 PyErr_SetString(PyExc_OverflowError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	342 "unsigned long is less than minimum");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	343 return -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	344 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	345 x = (unsigned long)y;
14499 7f23ec5cd9ca General cleanup in preparation for a bugfix: removed unused code, useless Tim Peters <tim.peters@gmail.com> parents: 14375 diff changeset	346
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	347 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	348 if (x > ULONG_MAX) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	349 PyErr_SetString(PyExc_OverflowError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	350 "unsigned long is greater than maximum");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	351 return -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	352 }
14499 7f23ec5cd9ca General cleanup in preparation for a bugfix: removed unused code, useless Tim Peters <tim.peters@gmail.com> parents: 14375 diff changeset	353
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	354 if (i >= 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	355 ((unsigned long *)ap->ob_item)[i] = x;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	356 return 0;
4875 911040e1bb11 Add new formats B, H, I, L for unsigned data types (analogous to the Guido van Rossum <guido@python.org> parents: 4634 diff changeset	357 }
911040e1bb11 Add new formats B, H, I, L for unsigned data types (analogous to the Guido van Rossum <guido@python.org> parents: 4634 diff changeset	358
911040e1bb11 Add new formats B, H, I, L for unsigned data types (analogous to the Guido van Rossum <guido@python.org> parents: 4634 diff changeset	359 static PyObject *
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36324 diff changeset	360 f_getitem(arrayobject *ap, Py_ssize_t i)
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	361 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	362 return PyFloat_FromDouble((double) ((float *)ap->ob_item)[i]);
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	363 }
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	364
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	365 static int
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36324 diff changeset	366 f_setitem(arrayobject ap, Py_ssize_t i, PyObject v)
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	367 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	368 float x;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	369 if (!PyArg_Parse(v, "f;array item must be float", &x))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	370 return -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	371 if (i >= 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	372 ((float *)ap->ob_item)[i] = x;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	373 return 0;
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	374 }
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	375
4628 7df5d4cf8277 Renamed Grandly (I think). Roger E. Masse <rmasse@newcnri.cnri.reston.va.us> parents: 4600 diff changeset	376 static PyObject *
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36324 diff changeset	377 d_getitem(arrayobject *ap, Py_ssize_t i)
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	378 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	379 return PyFloat_FromDouble(((double *)ap->ob_item)[i]);
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	380 }
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	381
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	382 static int
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36324 diff changeset	383 d_setitem(arrayobject ap, Py_ssize_t i, PyObject v)
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	384 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	385 double x;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	386 if (!PyArg_Parse(v, "d;array item must be float", &x))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	387 return -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	388 if (i >= 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	389 ((double *)ap->ob_item)[i] = x;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	390 return 0;
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	391 }
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	392
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: 42540 diff changeset	393
55259 edc714ffe6cc Issue #2389: Implement a portable mechanism for pickling array objects. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55204 diff changeset	394 /* Description of types.
edc714ffe6cc Issue #2389: Implement a portable mechanism for pickling array objects. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55204 diff changeset	395 *
edc714ffe6cc Issue #2389: Implement a portable mechanism for pickling array objects. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55204 diff changeset	396 * Don't forget to update typecode_to_mformat_code() if you add a new
edc714ffe6cc Issue #2389: Implement a portable mechanism for pickling array objects. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55204 diff changeset	397 * typecode.
edc714ffe6cc Issue #2389: Implement a portable mechanism for pickling array objects. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55204 diff changeset	398 */
1313 6ee380349c84 * Added gmtime/localtime/mktime and SYSV timezone globals to timemodule.c. Guido van Rossum <guido@python.org> parents: 1271 diff changeset	399 static struct arraydescr descriptors[] = {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	400 {'b', 1, b_getitem, b_setitem, "b", 1, 1},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	401 {'B', 1, BB_getitem, BB_setitem, "B", 1, 0},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	402 {'u', sizeof(Py_UNICODE), u_getitem, u_setitem, "u", 0, 0},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	403 {'h', sizeof(short), h_getitem, h_setitem, "h", 1, 1},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	404 {'H', sizeof(short), HH_getitem, HH_setitem, "H", 1, 0},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	405 {'i', sizeof(int), i_getitem, i_setitem, "i", 1, 1},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	406 {'I', sizeof(int), II_getitem, II_setitem, "I", 1, 0},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	407 {'l', sizeof(long), l_getitem, l_setitem, "l", 1, 1},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	408 {'L', sizeof(long), LL_getitem, LL_setitem, "L", 1, 0},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	409 {'f', sizeof(float), f_getitem, f_setitem, "f", 0, 0},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	410 {'d', sizeof(double), d_getitem, d_setitem, "d", 0, 0},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	411 {'\0', 0, 0, 0, 0, 0, 0} /* Sentinel */
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	412 };
14499 7f23ec5cd9ca General cleanup in preparation for a bugfix: removed unused code, useless Tim Peters <tim.peters@gmail.com> parents: 14375 diff changeset	413
7f23ec5cd9ca General cleanup in preparation for a bugfix: removed unused code, useless Tim Peters <tim.peters@gmail.com> parents: 14375 diff changeset	414 /****************************************************************************
7f23ec5cd9ca General cleanup in preparation for a bugfix: removed unused code, useless Tim Peters <tim.peters@gmail.com> parents: 14375 diff changeset	415 Implementations of array object methods.
7f23ec5cd9ca General cleanup in preparation for a bugfix: removed unused code, useless Tim Peters <tim.peters@gmail.com> parents: 14375 diff changeset	416 ****************************************************************************/
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	417
4628 7df5d4cf8277 Renamed Grandly (I think). Roger E. Masse <rmasse@newcnri.cnri.reston.va.us> parents: 4600 diff changeset	418 static PyObject *
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36324 diff changeset	419 newarrayobject(PyTypeObject type, Py_ssize_t size, struct arraydescr descr)
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	420 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	421 arrayobject *op;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	422 size_t nbytes;
22098 966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	423
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	424 if (size < 0) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	425 PyErr_BadInternalCall();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	426 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	427 }
22098 966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	428
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	429 nbytes = size * descr->itemsize;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	430 /* Check for overflow */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	431 if (nbytes / descr->itemsize != (size_t)size) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	432 return PyErr_NoMemory();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	433 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	434 op = (arrayobject *) type->tp_alloc(type, 0);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	435 if (op == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	436 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	437 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	438 op->ob_descr = descr;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	439 op->allocated = size;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	440 op->weakreflist = NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	441 Py_SIZE(op) = size;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	442 if (size <= 0) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	443 op->ob_item = NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	444 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	445 else {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	446 op->ob_item = PyMem_NEW(char, nbytes);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	447 if (op->ob_item == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	448 Py_DECREF(op);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	449 return PyErr_NoMemory();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	450 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	451 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	452 op->ob_exports = 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	453 return (PyObject *) op;
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	454 }
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	455
4628 7df5d4cf8277 Renamed Grandly (I think). Roger E. Masse <rmasse@newcnri.cnri.reston.va.us> parents: 4600 diff changeset	456 static PyObject *
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36324 diff changeset	457 getarrayitem(PyObject *op, Py_ssize_t i)
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	458 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	459 register arrayobject *ap;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	460 assert(array_Check(op));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	461 ap = (arrayobject *)op;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	462 assert(i>=0 && i<Py_SIZE(ap));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	463 return (*ap->ob_descr->getitem)(ap, i);
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	464 }
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	465
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	466 static int
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36324 diff changeset	467 ins1(arrayobject self, Py_ssize_t where, PyObject v)
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	468 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	469 char *items;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	470 Py_ssize_t n = Py_SIZE(self);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	471 if (v == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	472 PyErr_BadInternalCall();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	473 return -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	474 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	475 if ((*self->ob_descr->setitem)(self, -1, v) < 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	476 return -1;
31659 206d8575f644 Update the array overallocation scheme to match the approach used for Raymond Hettinger <python@rcn.com> parents: 31651 diff changeset	477
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	478 if (array_resize(self, n+1) == -1)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	479 return -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	480 items = self->ob_item;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	481 if (where < 0) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	482 where += n;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	483 if (where < 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	484 where = 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	485 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	486 if (where > n)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	487 where = n;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	488 /* appends don't need to call memmove() */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	489 if (where != n)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	490 memmove(items + (where+1)*self->ob_descr->itemsize,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	491 items + where*self->ob_descr->itemsize,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	492 (n-where)*self->ob_descr->itemsize);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	493 return (*self->ob_descr->setitem)(self, where, v);
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	494 }
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	495
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	496 /* Methods */
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	497
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	498 static void
13590 c503d8e474b3 ANSI-fication (got lost in the deep seas of source forge <wink>) Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13447 diff changeset	499 array_dealloc(arrayobject *op)
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	500 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	501 if (op->weakreflist != NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	502 PyObject_ClearWeakRefs((PyObject *) op);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	503 if (op->ob_item != NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	504 PyMem_DEL(op->ob_item);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	505 Py_TYPE(op)->tp_free((PyObject *)op);
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	506 }
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	507
15975 54205828b1e1 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15396 diff changeset	508 static PyObject *
54205828b1e1 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15396 diff changeset	509 array_richcompare(PyObject v, PyObject w, int op)
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	510 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	511 arrayobject va, wa;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	512 PyObject *vi = NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	513 PyObject *wi = NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	514 Py_ssize_t i, k;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	515 PyObject *res;
15975 54205828b1e1 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15396 diff changeset	516
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	517 if (!array_Check(v) \|\| !array_Check(w)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	518 Py_INCREF(Py_NotImplemented);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	519 return Py_NotImplemented;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	520 }
15975 54205828b1e1 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15396 diff changeset	521
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	522 va = (arrayobject *)v;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	523 wa = (arrayobject *)w;
15975 54205828b1e1 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15396 diff changeset	524
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	525 if (Py_SIZE(va) != Py_SIZE(wa) && (op == Py_EQ \|\| op == Py_NE)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	526 /* Shortcut: if the lengths differ, the arrays differ */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	527 if (op == Py_EQ)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	528 res = Py_False;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	529 else
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	530 res = Py_True;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	531 Py_INCREF(res);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	532 return res;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	533 }
15975 54205828b1e1 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15396 diff changeset	534
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	535 /* Search for the first index where items are different */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	536 k = 1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	537 for (i = 0; i < Py_SIZE(va) && i < Py_SIZE(wa); i++) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	538 vi = getarrayitem(v, i);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	539 wi = getarrayitem(w, i);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	540 if (vi == NULL \|\| wi == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	541 Py_XDECREF(vi);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	542 Py_XDECREF(wi);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	543 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	544 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	545 k = PyObject_RichCompareBool(vi, wi, Py_EQ);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	546 if (k == 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	547 break; /* Keeping vi and wi alive! */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	548 Py_DECREF(vi);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	549 Py_DECREF(wi);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	550 if (k < 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	551 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	552 }
15975 54205828b1e1 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15396 diff changeset	553
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	554 if (k) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	555 /* No more items to compare -- compare sizes */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	556 Py_ssize_t vs = Py_SIZE(va);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	557 Py_ssize_t ws = Py_SIZE(wa);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	558 int cmp;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	559 switch (op) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	560 case Py_LT: cmp = vs < ws; break;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	561 case Py_LE: cmp = vs <= ws; break;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	562 case Py_EQ: cmp = vs == ws; break;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	563 case Py_NE: cmp = vs != ws; break;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	564 case Py_GT: cmp = vs > ws; break;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	565 case Py_GE: cmp = vs >= ws; break;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	566 default: return NULL; /* cannot happen */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	567 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	568 if (cmp)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	569 res = Py_True;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	570 else
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	571 res = Py_False;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	572 Py_INCREF(res);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	573 return res;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	574 }
15975 54205828b1e1 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15396 diff changeset	575
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	576 /* We have an item that differs. First, shortcuts for EQ/NE */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	577 if (op == Py_EQ) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	578 Py_INCREF(Py_False);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	579 res = Py_False;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	580 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	581 else if (op == Py_NE) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	582 Py_INCREF(Py_True);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	583 res = Py_True;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	584 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	585 else {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	586 /* Compare the final item again using the proper operator */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	587 res = PyObject_RichCompare(vi, wi, op);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	588 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	589 Py_DECREF(vi);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	590 Py_DECREF(wi);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	591 return res;
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	592 }
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	593
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36324 diff changeset	594 static Py_ssize_t
13590 c503d8e474b3 ANSI-fication (got lost in the deep seas of source forge <wink>) Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13447 diff changeset	595 array_length(arrayobject *a)
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	596 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	597 return Py_SIZE(a);
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	598 }
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	599
4628 7df5d4cf8277 Renamed Grandly (I think). Roger E. Masse <rmasse@newcnri.cnri.reston.va.us> parents: 4600 diff changeset	600 static PyObject *
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36324 diff changeset	601 array_item(arrayobject *a, Py_ssize_t i)
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	602 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	603 if (i < 0 \|\| i >= Py_SIZE(a)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	604 PyErr_SetString(PyExc_IndexError, "array index out of range");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	605 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	606 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	607 return getarrayitem((PyObject *)a, i);
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	608 }
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	609
4628 7df5d4cf8277 Renamed Grandly (I think). Roger E. Masse <rmasse@newcnri.cnri.reston.va.us> parents: 4600 diff changeset	610 static PyObject *
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36324 diff changeset	611 array_slice(arrayobject *a, Py_ssize_t ilow, Py_ssize_t ihigh)
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	612 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	613 arrayobject *np;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	614 if (ilow < 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	615 ilow = 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	616 else if (ilow > Py_SIZE(a))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	617 ilow = Py_SIZE(a);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	618 if (ihigh < 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	619 ihigh = 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	620 if (ihigh < ilow)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	621 ihigh = ilow;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	622 else if (ihigh > Py_SIZE(a))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	623 ihigh = Py_SIZE(a);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	624 np = (arrayobject *) newarrayobject(&Arraytype, ihigh - ilow, a->ob_descr);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	625 if (np == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	626 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	627 memcpy(np->ob_item, a->ob_item + ilow * a->ob_descr->itemsize,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	628 (ihigh-ilow) * a->ob_descr->itemsize);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	629 return (PyObject *)np;
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	630 }
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	631
4628 7df5d4cf8277 Renamed Grandly (I think). Roger E. Masse <rmasse@newcnri.cnri.reston.va.us> parents: 4600 diff changeset	632 static PyObject *
31651 35cb8114b45c SF bug #910986: copy.copy fails for array.array Raymond Hettinger <python@rcn.com> parents: 30683 diff changeset	633 array_copy(arrayobject a, PyObject unused)
35cb8114b45c SF bug #910986: copy.copy fails for array.array Raymond Hettinger <python@rcn.com> parents: 30683 diff changeset	634 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	635 return array_slice(a, 0, Py_SIZE(a));
31651 35cb8114b45c SF bug #910986: copy.copy fails for array.array Raymond Hettinger <python@rcn.com> parents: 30683 diff changeset	636 }
35cb8114b45c SF bug #910986: copy.copy fails for array.array Raymond Hettinger <python@rcn.com> parents: 30683 diff changeset	637
35cb8114b45c SF bug #910986: copy.copy fails for array.array Raymond Hettinger <python@rcn.com> parents: 30683 diff changeset	638 PyDoc_STRVAR(copy_doc,
35cb8114b45c SF bug #910986: copy.copy fails for array.array Raymond Hettinger <python@rcn.com> parents: 30683 diff changeset	639 "copy(array)\n\
35cb8114b45c SF bug #910986: copy.copy fails for array.array Raymond Hettinger <python@rcn.com> parents: 30683 diff changeset	640 \n\
35cb8114b45c SF bug #910986: copy.copy fails for array.array Raymond Hettinger <python@rcn.com> parents: 30683 diff changeset	641 Return a copy of the array.");
35cb8114b45c SF bug #910986: copy.copy fails for array.array Raymond Hettinger <python@rcn.com> parents: 30683 diff changeset	642
35cb8114b45c SF bug #910986: copy.copy fails for array.array Raymond Hettinger <python@rcn.com> parents: 30683 diff changeset	643 static PyObject *
13590 c503d8e474b3 ANSI-fication (got lost in the deep seas of source forge <wink>) Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13447 diff changeset	644 array_concat(arrayobject a, PyObject bb)
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	645 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	646 Py_ssize_t size;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	647 arrayobject *np;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	648 if (!array_Check(bb)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	649 PyErr_Format(PyExc_TypeError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	650 "can only append array (not \"%.200s\") to array",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	651 Py_TYPE(bb)->tp_name);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	652 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	653 }
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	654 #define b ((arrayobject *)bb)
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	655 if (a->ob_descr != b->ob_descr) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	656 PyErr_BadArgument();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	657 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	658 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	659 if (Py_SIZE(a) > PY_SSIZE_T_MAX - Py_SIZE(b)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	660 return PyErr_NoMemory();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	661 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	662 size = Py_SIZE(a) + Py_SIZE(b);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	663 np = (arrayobject *) newarrayobject(&Arraytype, size, a->ob_descr);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	664 if (np == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	665 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	666 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	667 memcpy(np->ob_item, a->ob_item, Py_SIZE(a)*a->ob_descr->itemsize);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	668 memcpy(np->ob_item + Py_SIZE(a)*a->ob_descr->itemsize,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	669 b->ob_item, Py_SIZE(b)*b->ob_descr->itemsize);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	670 return (PyObject *)np;
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	671 #undef b
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	672 }
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	673
4628 7df5d4cf8277 Renamed Grandly (I think). Roger E. Masse <rmasse@newcnri.cnri.reston.va.us> parents: 4600 diff changeset	674 static PyObject *
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36324 diff changeset	675 array_repeat(arrayobject *a, Py_ssize_t n)
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	676 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	677 Py_ssize_t i;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	678 Py_ssize_t size;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	679 arrayobject *np;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	680 char *p;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	681 Py_ssize_t nbytes;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	682 if (n < 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	683 n = 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	684 if ((Py_SIZE(a) != 0) && (n > PY_SSIZE_T_MAX / Py_SIZE(a))) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	685 return PyErr_NoMemory();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	686 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	687 size = Py_SIZE(a) * n;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	688 np = (arrayobject *) newarrayobject(&Arraytype, size, a->ob_descr);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	689 if (np == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	690 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	691 p = np->ob_item;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	692 nbytes = Py_SIZE(a) * a->ob_descr->itemsize;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	693 for (i = 0; i < n; i++) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	694 memcpy(p, a->ob_item, nbytes);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	695 p += nbytes;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	696 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	697 return (PyObject *) np;
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	698 }
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	699
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	700 static int
36518 9f3f87e920a6 Use Py_ssize_t for counts and sizes. Martin v. Löwis <martin@v.loewis.de> parents: 36501 diff changeset	701 array_ass_slice(arrayobject a, Py_ssize_t ilow, Py_ssize_t ihigh, PyObject v)
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	702 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	703 char *item;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	704 Py_ssize_t n; /* Size of replacement array */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	705 Py_ssize_t d; /* Change in size */
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	706 #define b ((arrayobject *)v)
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	707 if (v == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	708 n = 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	709 else if (array_Check(v)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	710 n = Py_SIZE(b);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	711 if (a == b) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	712 /* Special case "a[i:j] = a" -- copy b first */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	713 int ret;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	714 v = array_slice(b, 0, n);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	715 if (!v)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	716 return -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	717 ret = array_ass_slice(a, ilow, ihigh, v);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	718 Py_DECREF(v);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	719 return ret;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	720 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	721 if (b->ob_descr != a->ob_descr) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	722 PyErr_BadArgument();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	723 return -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	724 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	725 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	726 else {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	727 PyErr_Format(PyExc_TypeError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	728 "can only assign array (not \"%.200s\") to array slice",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	729 Py_TYPE(v)->tp_name);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	730 return -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	731 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	732 if (ilow < 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	733 ilow = 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	734 else if (ilow > Py_SIZE(a))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	735 ilow = Py_SIZE(a);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	736 if (ihigh < 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	737 ihigh = 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	738 if (ihigh < ilow)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	739 ihigh = ilow;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	740 else if (ihigh > Py_SIZE(a))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	741 ihigh = Py_SIZE(a);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	742 item = a->ob_item;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	743 d = n - (ihigh-ilow);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	744 /* Issue #4509: If the array has exported buffers and the slice
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	745 assignment would change the size of the array, fail early to make
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	746 sure we don't modify it. */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	747 if (d != 0 && a->ob_exports > 0) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	748 PyErr_SetString(PyExc_BufferError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	749 "cannot resize an array that is exporting buffers");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	750 return -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	751 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	752 if (d < 0) { /* Delete -d items */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	753 memmove(item + (ihigh+d)*a->ob_descr->itemsize,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	754 item + ihigh*a->ob_descr->itemsize,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	755 (Py_SIZE(a)-ihigh)*a->ob_descr->itemsize);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	756 if (array_resize(a, Py_SIZE(a) + d) == -1)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	757 return -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	758 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	759 else if (d > 0) { /* Insert d items */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	760 if (array_resize(a, Py_SIZE(a) + d))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	761 return -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	762 memmove(item + (ihigh+d)*a->ob_descr->itemsize,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	763 item + ihigh*a->ob_descr->itemsize,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	764 (Py_SIZE(a)-ihigh)*a->ob_descr->itemsize);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	765 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	766 if (n > 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	767 memcpy(item + ilow*a->ob_descr->itemsize, b->ob_item,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	768 n*b->ob_descr->itemsize);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	769 return 0;
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	770 #undef b
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	771 }
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	772
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	773 static int
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36324 diff changeset	774 array_ass_item(arrayobject a, Py_ssize_t i, PyObject v)
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	775 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	776 if (i < 0 \|\| i >= Py_SIZE(a)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	777 PyErr_SetString(PyExc_IndexError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	778 "array assignment index out of range");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	779 return -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	780 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	781 if (v == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	782 return array_ass_slice(a, i, i+1, v);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	783 return (*a->ob_descr->setitem)(a, i, v);
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	784 }
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	785
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	786 static int
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36324 diff changeset	787 setarrayitem(PyObject a, Py_ssize_t i, PyObject v)
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	788 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	789 assert(array_Check(a));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	790 return array_ass_item((arrayobject *)a, i, v);
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	791 }
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	792
22098 966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	793 static int
31660 35f56e08727f SF feature request #686323: Minor array module enhancements Raymond Hettinger <python@rcn.com> parents: 31659 diff changeset	794 array_iter_extend(arrayobject self, PyObject bb)
35f56e08727f SF feature request #686323: Minor array module enhancements Raymond Hettinger <python@rcn.com> parents: 31659 diff changeset	795 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	796 PyObject it, v;
31660 35f56e08727f SF feature request #686323: Minor array module enhancements Raymond Hettinger <python@rcn.com> parents: 31659 diff changeset	797
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	798 it = PyObject_GetIter(bb);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	799 if (it == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	800 return -1;
31660 35f56e08727f SF feature request #686323: Minor array module enhancements Raymond Hettinger <python@rcn.com> parents: 31659 diff changeset	801
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	802 while ((v = PyIter_Next(it)) != NULL) {
63764 f806fb3d1f27 Issue #9526: Remove outdated casts to int that were preventing the array module from working correctly with arrays > 2GB. Mark Dickinson <dickinsm@gmail.com> parents: 61466 diff changeset	803 if (ins1(self, Py_SIZE(self), v) != 0) {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	804 Py_DECREF(v);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	805 Py_DECREF(it);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	806 return -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	807 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	808 Py_DECREF(v);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	809 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	810 Py_DECREF(it);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	811 if (PyErr_Occurred())
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	812 return -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	813 return 0;
31660 35f56e08727f SF feature request #686323: Minor array module enhancements Raymond Hettinger <python@rcn.com> parents: 31659 diff changeset	814 }
35f56e08727f SF feature request #686323: Minor array module enhancements Raymond Hettinger <python@rcn.com> parents: 31659 diff changeset	815
35f56e08727f SF feature request #686323: Minor array module enhancements Raymond Hettinger <python@rcn.com> parents: 31659 diff changeset	816 static int
22098 966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	817 array_do_extend(arrayobject self, PyObject bb)
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	818 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	819 Py_ssize_t size, oldsize, bbsize;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	820
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	821 if (!array_Check(bb))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	822 return array_iter_extend(self, bb);
22098 966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	823 #define b ((arrayobject *)bb)
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	824 if (self->ob_descr != b->ob_descr) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	825 PyErr_SetString(PyExc_TypeError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	826 "can only extend with array of same kind");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	827 return -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	828 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	829 if ((Py_SIZE(self) > PY_SSIZE_T_MAX - Py_SIZE(b)) \|\|
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	830 ((Py_SIZE(self) + Py_SIZE(b)) > PY_SSIZE_T_MAX / self->ob_descr->itemsize)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	831 PyErr_NoMemory();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	832 return -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	833 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	834 oldsize = Py_SIZE(self);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	835 /* Get the size of bb before resizing the array since bb could be self. */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	836 bbsize = Py_SIZE(bb);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	837 size = oldsize + Py_SIZE(b);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	838 if (array_resize(self, size) == -1)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	839 return -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	840 memcpy(self->ob_item + oldsize * self->ob_descr->itemsize,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	841 b->ob_item, bbsize * b->ob_descr->itemsize);
22098 966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	842
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	843 return 0;
22098 966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	844 #undef b
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	845 }
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	846
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	847 static PyObject *
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	848 array_inplace_concat(arrayobject self, PyObject bb)
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	849 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	850 if (!array_Check(bb)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	851 PyErr_Format(PyExc_TypeError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	852 "can only extend array with array (not \"%.200s\")",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	853 Py_TYPE(bb)->tp_name);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	854 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	855 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	856 if (array_do_extend(self, bb) == -1)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	857 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	858 Py_INCREF(self);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	859 return (PyObject *)self;
22098 966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	860 }
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	861
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	862 static PyObject *
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36324 diff changeset	863 array_inplace_repeat(arrayobject *self, Py_ssize_t n)
22098 966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	864 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	865 char items, p;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	866 Py_ssize_t size, i;
22098 966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	867
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	868 if (Py_SIZE(self) > 0) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	869 if (n < 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	870 n = 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	871 items = self->ob_item;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	872 if ((self->ob_descr->itemsize != 0) &&
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	873 (Py_SIZE(self) > PY_SSIZE_T_MAX / self->ob_descr->itemsize)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	874 return PyErr_NoMemory();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	875 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	876 size = Py_SIZE(self) * self->ob_descr->itemsize;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	877 if (n > 0 && size > PY_SSIZE_T_MAX / n) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	878 return PyErr_NoMemory();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	879 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	880 if (array_resize(self, n * Py_SIZE(self)) == -1)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	881 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	882 items = p = self->ob_item;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	883 for (i = 1; i < n; i++) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	884 p += size;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	885 memcpy(p, items, size);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	886 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	887 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	888 Py_INCREF(self);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	889 return (PyObject *)self;
22098 966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	890 }
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	891
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	892
4628 7df5d4cf8277 Renamed Grandly (I think). Roger E. Masse <rmasse@newcnri.cnri.reston.va.us> parents: 4600 diff changeset	893 static PyObject *
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36324 diff changeset	894 ins(arrayobject self, Py_ssize_t where, PyObject v)
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	895 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	896 if (ins1(self, where, v) != 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	897 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	898 Py_INCREF(Py_None);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	899 return Py_None;
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	900 }
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	901
4628 7df5d4cf8277 Renamed Grandly (I think). Roger E. Masse <rmasse@newcnri.cnri.reston.va.us> parents: 4600 diff changeset	902 static PyObject *
27044 23280a64288e SF patch 660559: Use METH_O and METH_NOARGS where possible Raymond Hettinger <python@rcn.com> parents: 24471 diff changeset	903 array_count(arrayobject self, PyObject v)
13772 eea51275acbf added count, extend, index, pop and remove to arraymodule Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13651 diff changeset	904 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	905 Py_ssize_t count = 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	906 Py_ssize_t i;
13772 eea51275acbf added count, extend, index, pop and remove to arraymodule Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13651 diff changeset	907
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	908 for (i = 0; i < Py_SIZE(self); i++) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	909 PyObject selfi = getarrayitem((PyObject )self, i);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	910 int cmp = PyObject_RichCompareBool(selfi, v, Py_EQ);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	911 Py_DECREF(selfi);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	912 if (cmp > 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	913 count++;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	914 else if (cmp < 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	915 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	916 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	917 return PyLong_FromSsize_t(count);
13772 eea51275acbf added count, extend, index, pop and remove to arraymodule Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13651 diff changeset	918 }
eea51275acbf added count, extend, index, pop and remove to arraymodule Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13651 diff changeset	919
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23433 diff changeset	920 PyDoc_STRVAR(count_doc,
14649 1ec6c63347ea arraymodule: Fix SF bug 113960. Tim Peters <tim.peters@gmail.com> parents: 14499 diff changeset	921 "count(x)\n\
13772 eea51275acbf added count, extend, index, pop and remove to arraymodule Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13651 diff changeset	922 \n\
51776 d06a3ebf306f Merged revisions 69846 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 51271 diff changeset	923 Return number of occurrences of x in the array.");
13772 eea51275acbf added count, extend, index, pop and remove to arraymodule Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13651 diff changeset	924
eea51275acbf added count, extend, index, pop and remove to arraymodule Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13651 diff changeset	925 static PyObject *
27044 23280a64288e SF patch 660559: Use METH_O and METH_NOARGS where possible Raymond Hettinger <python@rcn.com> parents: 24471 diff changeset	926 array_index(arrayobject self, PyObject v)
13772 eea51275acbf added count, extend, index, pop and remove to arraymodule Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13651 diff changeset	927 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	928 Py_ssize_t i;
13772 eea51275acbf added count, extend, index, pop and remove to arraymodule Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13651 diff changeset	929
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	930 for (i = 0; i < Py_SIZE(self); i++) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	931 PyObject selfi = getarrayitem((PyObject )self, i);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	932 int cmp = PyObject_RichCompareBool(selfi, v, Py_EQ);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	933 Py_DECREF(selfi);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	934 if (cmp > 0) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	935 return PyLong_FromLong((long)i);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	936 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	937 else if (cmp < 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	938 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	939 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	940 PyErr_SetString(PyExc_ValueError, "array.index(x): x not in list");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	941 return NULL;
13772 eea51275acbf added count, extend, index, pop and remove to arraymodule Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13651 diff changeset	942 }
eea51275acbf added count, extend, index, pop and remove to arraymodule Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13651 diff changeset	943
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23433 diff changeset	944 PyDoc_STRVAR(index_doc,
14649 1ec6c63347ea arraymodule: Fix SF bug 113960. Tim Peters <tim.peters@gmail.com> parents: 14499 diff changeset	945 "index(x)\n\
13772 eea51275acbf added count, extend, index, pop and remove to arraymodule Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13651 diff changeset	946 \n\
51776 d06a3ebf306f Merged revisions 69846 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 51271 diff changeset	947 Return index of first occurrence of x in the array.");
13772 eea51275acbf added count, extend, index, pop and remove to arraymodule Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13651 diff changeset	948
27128 047b6e16ab2e SF patch #662433: Fill arraymodule's tp_iter and sq_contains slots Raymond Hettinger <python@rcn.com> parents: 27104 diff changeset	949 static int
047b6e16ab2e SF patch #662433: Fill arraymodule's tp_iter and sq_contains slots Raymond Hettinger <python@rcn.com> parents: 27104 diff changeset	950 array_contains(arrayobject self, PyObject v)
047b6e16ab2e SF patch #662433: Fill arraymodule's tp_iter and sq_contains slots Raymond Hettinger <python@rcn.com> parents: 27104 diff changeset	951 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	952 Py_ssize_t i;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	953 int cmp;
27128 047b6e16ab2e SF patch #662433: Fill arraymodule's tp_iter and sq_contains slots Raymond Hettinger <python@rcn.com> parents: 27104 diff changeset	954
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	955 for (i = 0, cmp = 0 ; cmp == 0 && i < Py_SIZE(self); i++) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	956 PyObject selfi = getarrayitem((PyObject )self, i);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	957 cmp = PyObject_RichCompareBool(selfi, v, Py_EQ);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	958 Py_DECREF(selfi);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	959 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	960 return cmp;
27128 047b6e16ab2e SF patch #662433: Fill arraymodule's tp_iter and sq_contains slots Raymond Hettinger <python@rcn.com> parents: 27104 diff changeset	961 }
047b6e16ab2e SF patch #662433: Fill arraymodule's tp_iter and sq_contains slots Raymond Hettinger <python@rcn.com> parents: 27104 diff changeset	962
13772 eea51275acbf added count, extend, index, pop and remove to arraymodule Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13651 diff changeset	963 static PyObject *
27044 23280a64288e SF patch 660559: Use METH_O and METH_NOARGS where possible Raymond Hettinger <python@rcn.com> parents: 24471 diff changeset	964 array_remove(arrayobject self, PyObject v)
13772 eea51275acbf added count, extend, index, pop and remove to arraymodule Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13651 diff changeset	965 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	966 int i;
13772 eea51275acbf added count, extend, index, pop and remove to arraymodule Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13651 diff changeset	967
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	968 for (i = 0; i < Py_SIZE(self); i++) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	969 PyObject selfi = getarrayitem((PyObject )self,i);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	970 int cmp = PyObject_RichCompareBool(selfi, v, Py_EQ);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	971 Py_DECREF(selfi);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	972 if (cmp > 0) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	973 if (array_ass_slice(self, i, i+1,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	974 (PyObject *)NULL) != 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	975 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	976 Py_INCREF(Py_None);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	977 return Py_None;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	978 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	979 else if (cmp < 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	980 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	981 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	982 PyErr_SetString(PyExc_ValueError, "array.remove(x): x not in list");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	983 return NULL;
13772 eea51275acbf added count, extend, index, pop and remove to arraymodule Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13651 diff changeset	984 }
eea51275acbf added count, extend, index, pop and remove to arraymodule Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13651 diff changeset	985
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23433 diff changeset	986 PyDoc_STRVAR(remove_doc,
14649 1ec6c63347ea arraymodule: Fix SF bug 113960. Tim Peters <tim.peters@gmail.com> parents: 14499 diff changeset	987 "remove(x)\n\
13772 eea51275acbf added count, extend, index, pop and remove to arraymodule Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13651 diff changeset	988 \n\
51776 d06a3ebf306f Merged revisions 69846 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 51271 diff changeset	989 Remove the first occurrence of x in the array.");
13772 eea51275acbf added count, extend, index, pop and remove to arraymodule Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13651 diff changeset	990
eea51275acbf added count, extend, index, pop and remove to arraymodule Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13651 diff changeset	991 static PyObject *
eea51275acbf added count, extend, index, pop and remove to arraymodule Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13651 diff changeset	992 array_pop(arrayobject self, PyObject args)
eea51275acbf added count, extend, index, pop and remove to arraymodule Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13651 diff changeset	993 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	994 Py_ssize_t i = -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	995 PyObject *v;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	996 if (!PyArg_ParseTuple(args, "\|n:pop", &i))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	997 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	998 if (Py_SIZE(self) == 0) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	999 /* Special-case most common failure cause */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1000 PyErr_SetString(PyExc_IndexError, "pop from empty array");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1001 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1002 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1003 if (i < 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1004 i += Py_SIZE(self);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1005 if (i < 0 \|\| i >= Py_SIZE(self)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1006 PyErr_SetString(PyExc_IndexError, "pop index out of range");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1007 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1008 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1009 v = getarrayitem((PyObject *)self,i);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1010 if (array_ass_slice(self, i, i+1, (PyObject *)NULL) != 0) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1011 Py_DECREF(v);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1012 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1013 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1014 return v;
13772 eea51275acbf added count, extend, index, pop and remove to arraymodule Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13651 diff changeset	1015 }
eea51275acbf added count, extend, index, pop and remove to arraymodule Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13651 diff changeset	1016
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23433 diff changeset	1017 PyDoc_STRVAR(pop_doc,
14649 1ec6c63347ea arraymodule: Fix SF bug 113960. Tim Peters <tim.peters@gmail.com> parents: 14499 diff changeset	1018 "pop([i])\n\
13772 eea51275acbf added count, extend, index, pop and remove to arraymodule Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13651 diff changeset	1019 \n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23433 diff changeset	1020 Return the i-th element and delete it from the array. i defaults to -1.");
13772 eea51275acbf added count, extend, index, pop and remove to arraymodule Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13651 diff changeset	1021
eea51275acbf added count, extend, index, pop and remove to arraymodule Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13651 diff changeset	1022 static PyObject *
27044 23280a64288e SF patch 660559: Use METH_O and METH_NOARGS where possible Raymond Hettinger <python@rcn.com> parents: 24471 diff changeset	1023 array_extend(arrayobject self, PyObject bb)
13772 eea51275acbf added count, extend, index, pop and remove to arraymodule Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13651 diff changeset	1024 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1025 if (array_do_extend(self, bb) == -1)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1026 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1027 Py_INCREF(Py_None);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1028 return Py_None;
13772 eea51275acbf added count, extend, index, pop and remove to arraymodule Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13651 diff changeset	1029 }
eea51275acbf added count, extend, index, pop and remove to arraymodule Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13651 diff changeset	1030
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23433 diff changeset	1031 PyDoc_STRVAR(extend_doc,
31660 35f56e08727f SF feature request #686323: Minor array module enhancements Raymond Hettinger <python@rcn.com> parents: 31659 diff changeset	1032 "extend(array or iterable)\n\
13772 eea51275acbf added count, extend, index, pop and remove to arraymodule Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13651 diff changeset	1033 \n\
31660 35f56e08727f SF feature request #686323: Minor array module enhancements Raymond Hettinger <python@rcn.com> parents: 31659 diff changeset	1034 Append items to the end of the array.");
13772 eea51275acbf added count, extend, index, pop and remove to arraymodule Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13651 diff changeset	1035
eea51275acbf added count, extend, index, pop and remove to arraymodule Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13651 diff changeset	1036 static PyObject *
13590 c503d8e474b3 ANSI-fication (got lost in the deep seas of source forge <wink>) Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13447 diff changeset	1037 array_insert(arrayobject self, PyObject args)
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	1038 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1039 Py_ssize_t i;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1040 PyObject *v;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1041 if (!PyArg_ParseTuple(args, "nO:insert", &i, &v))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1042 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1043 return ins(self, i, v);
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	1044 }
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	1045
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23433 diff changeset	1046 PyDoc_STRVAR(insert_doc,
14649 1ec6c63347ea arraymodule: Fix SF bug 113960. Tim Peters <tim.peters@gmail.com> parents: 14499 diff changeset	1047 "insert(i,x)\n\
9343 4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	1048 \n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23433 diff changeset	1049 Insert a new item x into the array before position i.");
9343 4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	1050
4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	1051
4628 7df5d4cf8277 Renamed Grandly (I think). Roger E. Masse <rmasse@newcnri.cnri.reston.va.us> parents: 4600 diff changeset	1052 static PyObject *
27044 23280a64288e SF patch 660559: Use METH_O and METH_NOARGS where possible Raymond Hettinger <python@rcn.com> parents: 24471 diff changeset	1053 array_buffer_info(arrayobject self, PyObject unused)
5982 6aebd970b7a9 Added buffer_info() method that returns address and length in bytes of Guido van Rossum <guido@python.org> parents: 5696 diff changeset	1054 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1055 PyObject* retval = NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1056 retval = PyTuple_New(2);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1057 if (!retval)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1058 return NULL;
13068 705132667f7b Trent Mick <trentm@activestate.com>: Fred Drake <fdrake@acm.org> parents: 12814 diff changeset	1059
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1060 PyTuple_SET_ITEM(retval, 0, PyLong_FromVoidPtr(self->ob_item));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1061 PyTuple_SET_ITEM(retval, 1, PyLong_FromLong((long)(Py_SIZE(self))));
13068 705132667f7b Trent Mick <trentm@activestate.com>: Fred Drake <fdrake@acm.org> parents: 12814 diff changeset	1062
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1063 return retval;
5982 6aebd970b7a9 Added buffer_info() method that returns address and length in bytes of Guido van Rossum <guido@python.org> parents: 5696 diff changeset	1064 }
6aebd970b7a9 Added buffer_info() method that returns address and length in bytes of Guido van Rossum <guido@python.org> parents: 5696 diff changeset	1065
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23433 diff changeset	1066 PyDoc_STRVAR(buffer_info_doc,
14649 1ec6c63347ea arraymodule: Fix SF bug 113960. Tim Peters <tim.peters@gmail.com> parents: 14499 diff changeset	1067 "buffer_info() -> (address, length)\n\
9343 4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	1068 \n\
4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	1069 Return a tuple (address, length) giving the current memory address and\n\
18851 ef2031c54875 Fix buffer_info() docstring to match reality. See SF bug #444842. Guido van Rossum <guido@python.org> parents: 18036 diff changeset	1070 the length in items of the buffer used to hold array's contents\n\
ef2031c54875 Fix buffer_info() docstring to match reality. See SF bug #444842. Guido van Rossum <guido@python.org> parents: 18036 diff changeset	1071 The length should be multiplied by the itemsize attribute to calculate\n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23433 diff changeset	1072 the buffer length in bytes.");
9343 4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	1073
4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	1074
5982 6aebd970b7a9 Added buffer_info() method that returns address and length in bytes of Guido van Rossum <guido@python.org> parents: 5696 diff changeset	1075 static PyObject *
27044 23280a64288e SF patch 660559: Use METH_O and METH_NOARGS where possible Raymond Hettinger <python@rcn.com> parents: 24471 diff changeset	1076 array_append(arrayobject self, PyObject v)
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	1077 {
63764 f806fb3d1f27 Issue #9526: Remove outdated casts to int that were preventing the array module from working correctly with arrays > 2GB. Mark Dickinson <dickinsm@gmail.com> parents: 61466 diff changeset	1078 return ins(self, Py_SIZE(self), v);
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	1079 }
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	1080
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23433 diff changeset	1081 PyDoc_STRVAR(append_doc,
9343 4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	1082 "append(x)\n\
4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	1083 \n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23433 diff changeset	1084 Append new value x to the end of the array.");
9343 4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	1085
4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	1086
4628 7df5d4cf8277 Renamed Grandly (I think). Roger E. Masse <rmasse@newcnri.cnri.reston.va.us> parents: 4600 diff changeset	1087 static PyObject *
27044 23280a64288e SF patch 660559: Use METH_O and METH_NOARGS where possible Raymond Hettinger <python@rcn.com> parents: 24471 diff changeset	1088 array_byteswap(arrayobject self, PyObject unused)
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	1089 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1090 char *p;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1091 Py_ssize_t i;
11522 cbf58cd0bb57 Correct the docstring for byteswap(); error noted by Bernhard Reiter Fred Drake <fdrake@acm.org> parents: 11242 diff changeset	1092
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1093 switch (self->ob_descr->itemsize) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1094 case 1:
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1095 break;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1096 case 2:
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1097 for (p = self->ob_item, i = Py_SIZE(self); --i >= 0; p += 2) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1098 char p0 = p[0];
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1099 p[0] = p[1];
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1100 p[1] = p0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1101 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1102 break;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1103 case 4:
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1104 for (p = self->ob_item, i = Py_SIZE(self); --i >= 0; p += 4) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1105 char p0 = p[0];
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1106 char p1 = p[1];
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1107 p[0] = p[3];
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1108 p[1] = p[2];
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1109 p[2] = p1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1110 p[3] = p0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1111 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1112 break;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1113 case 8:
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1114 for (p = self->ob_item, i = Py_SIZE(self); --i >= 0; p += 8) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1115 char p0 = p[0];
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1116 char p1 = p[1];
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1117 char p2 = p[2];
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1118 char p3 = p[3];
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1119 p[0] = p[7];
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1120 p[1] = p[6];
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1121 p[2] = p[5];
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1122 p[3] = p[4];
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1123 p[4] = p3;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1124 p[5] = p2;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1125 p[6] = p1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1126 p[7] = p0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1127 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1128 break;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1129 default:
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1130 PyErr_SetString(PyExc_RuntimeError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1131 "don't know how to byteswap this array type");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1132 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1133 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1134 Py_INCREF(Py_None);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1135 return Py_None;
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	1136 }
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	1137
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23433 diff changeset	1138 PyDoc_STRVAR(byteswap_doc,
11522 cbf58cd0bb57 Correct the docstring for byteswap(); error noted by Bernhard Reiter Fred Drake <fdrake@acm.org> parents: 11242 diff changeset	1139 "byteswap()\n\
9343 4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	1140 \n\
11522 cbf58cd0bb57 Correct the docstring for byteswap(); error noted by Bernhard Reiter Fred Drake <fdrake@acm.org> parents: 11242 diff changeset	1141 Byteswap all items of the array. If the items in the array are not 1, 2,\n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23433 diff changeset	1142 4, or 8 bytes in size, RuntimeError is raised.");
9343 4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	1143
4628 7df5d4cf8277 Renamed Grandly (I think). Roger E. Masse <rmasse@newcnri.cnri.reston.va.us> parents: 4600 diff changeset	1144 static PyObject *
27044 23280a64288e SF patch 660559: Use METH_O and METH_NOARGS where possible Raymond Hettinger <python@rcn.com> parents: 24471 diff changeset	1145 array_reverse(arrayobject self, PyObject unused)
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	1146 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1147 register Py_ssize_t itemsize = self->ob_descr->itemsize;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1148 register char p, q;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1149 /* little buffer to hold items while swapping */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1150 char tmp[256]; /* 8 is probably enough -- but why skimp */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1151 assert((size_t)itemsize <= sizeof(tmp));
1393 7d6a2d950f13 * nismodule.c: database keys and values can contain null bytes. be more Guido van Rossum <guido@python.org> parents: 1391 diff changeset	1152
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1153 if (Py_SIZE(self) > 1) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1154 for (p = self->ob_item,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1155 q = self->ob_item + (Py_SIZE(self) - 1)*itemsize;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1156 p < q;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1157 p += itemsize, q -= itemsize) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1158 /* memory areas guaranteed disjoint, so memcpy
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1159 * is safe (& memmove may be slower).
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1160 */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1161 memcpy(tmp, p, itemsize);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1162 memcpy(p, q, itemsize);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1163 memcpy(q, tmp, itemsize);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1164 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1165 }
14499 7f23ec5cd9ca General cleanup in preparation for a bugfix: removed unused code, useless Tim Peters <tim.peters@gmail.com> parents: 14375 diff changeset	1166
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1167 Py_INCREF(Py_None);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1168 return Py_None;
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	1169 }
1393 7d6a2d950f13 * nismodule.c: database keys and values can contain null bytes. be more Guido van Rossum <guido@python.org> parents: 1391 diff changeset	1170
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23433 diff changeset	1171 PyDoc_STRVAR(reverse_doc,
9343 4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	1172 "reverse()\n\
4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	1173 \n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23433 diff changeset	1174 Reverse the order of the items in the array.");
9343 4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	1175
41859 e4e8b12770e4 Fixed array.fromfile(); removed references to PyFileObject in array.tofile(). Guido van Rossum <guido@python.org> parents: 41788 diff changeset	1176
e4e8b12770e4 Fixed array.fromfile(); removed references to PyFileObject in array.tofile(). Guido van Rossum <guido@python.org> parents: 41788 diff changeset	1177 /* Forward */
64355 fa8b57f987c5 Issue #8990: array.fromstring() and array.tostring() get renamed to Antoine Pitrou <solipsis@pitrou.net> parents: 63764 diff changeset	1178 static PyObject array_frombytes(arrayobject self, PyObject *args);
41859 e4e8b12770e4 Fixed array.fromfile(); removed references to PyFileObject in array.tofile(). Guido van Rossum <guido@python.org> parents: 41788 diff changeset	1179
4628 7df5d4cf8277 Renamed Grandly (I think). Roger E. Masse <rmasse@newcnri.cnri.reston.va.us> parents: 4600 diff changeset	1180 static PyObject *
13590 c503d8e474b3 ANSI-fication (got lost in the deep seas of source forge <wink>) Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13447 diff changeset	1181 array_fromfile(arrayobject self, PyObject args)
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	1182 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1183 PyObject f, b, *res;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1184 Py_ssize_t itemsize = self->ob_descr->itemsize;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1185 Py_ssize_t n, nbytes;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1186 int not_enough_bytes;
41859 e4e8b12770e4 Fixed array.fromfile(); removed references to PyFileObject in array.tofile(). Guido van Rossum <guido@python.org> parents: 41788 diff changeset	1187
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1188 if (!PyArg_ParseTuple(args, "On:fromfile", &f, &n))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1189 return NULL;
41859 e4e8b12770e4 Fixed array.fromfile(); removed references to PyFileObject in array.tofile(). Guido van Rossum <guido@python.org> parents: 41788 diff changeset	1190
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1191 nbytes = n * itemsize;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1192 if (nbytes < 0 \|\| nbytes/itemsize != n) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1193 PyErr_NoMemory();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1194 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1195 }
41859 e4e8b12770e4 Fixed array.fromfile(); removed references to PyFileObject in array.tofile(). Guido van Rossum <guido@python.org> parents: 41788 diff changeset	1196
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1197 b = PyObject_CallMethod(f, "read", "n", nbytes);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1198 if (b == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1199 return NULL;
41859 e4e8b12770e4 Fixed array.fromfile(); removed references to PyFileObject in array.tofile(). Guido van Rossum <guido@python.org> parents: 41788 diff changeset	1200
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1201 if (!PyBytes_Check(b)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1202 PyErr_SetString(PyExc_TypeError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1203 "read() didn't return bytes");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1204 Py_DECREF(b);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1205 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1206 }
41859 e4e8b12770e4 Fixed array.fromfile(); removed references to PyFileObject in array.tofile(). Guido van Rossum <guido@python.org> parents: 41788 diff changeset	1207
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1208 not_enough_bytes = (PyBytes_GET_SIZE(b) != nbytes);
41859 e4e8b12770e4 Fixed array.fromfile(); removed references to PyFileObject in array.tofile(). Guido van Rossum <guido@python.org> parents: 41788 diff changeset	1209
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1210 args = Py_BuildValue("(O)", b);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1211 Py_DECREF(b);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1212 if (args == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1213 return NULL;
41859 e4e8b12770e4 Fixed array.fromfile(); removed references to PyFileObject in array.tofile(). Guido van Rossum <guido@python.org> parents: 41788 diff changeset	1214
64355 fa8b57f987c5 Issue #8990: array.fromstring() and array.tostring() get renamed to Antoine Pitrou <solipsis@pitrou.net> parents: 63764 diff changeset	1215 res = array_frombytes(self, args);
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1216 Py_DECREF(args);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1217 if (res == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1218 return NULL;
52040 9fa7949641d3 Issue #5334: array.fromfile() failed to insert values when EOFError was raised. Hirokazu Yamamoto <ocean-city@m2.ccsnet.ne.jp> parents: 51776 diff changeset	1219
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1220 if (not_enough_bytes) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1221 PyErr_SetString(PyExc_EOFError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1222 "read() didn't return enough bytes");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1223 Py_DECREF(res);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1224 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1225 }
41859 e4e8b12770e4 Fixed array.fromfile(); removed references to PyFileObject in array.tofile(). Guido van Rossum <guido@python.org> parents: 41788 diff changeset	1226
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1227 return res;
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	1228 }
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	1229
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23433 diff changeset	1230 PyDoc_STRVAR(fromfile_doc,
9343 4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	1231 "fromfile(f, n)\n\
4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	1232 \n\
4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	1233 Read n objects from the file object f and append them to the end of the\n\
45083 c66da57b9488 Remove the deprecated array.read/write methods. Georg Brandl <georg@python.org> parents: 44351 diff changeset	1234 array.");
9343 4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	1235
4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	1236
4628 7df5d4cf8277 Renamed Grandly (I think). Roger E. Masse <rmasse@newcnri.cnri.reston.va.us> parents: 4600 diff changeset	1237 static PyObject *
27044 23280a64288e SF patch 660559: Use METH_O and METH_NOARGS where possible Raymond Hettinger <python@rcn.com> parents: 24471 diff changeset	1238 array_tofile(arrayobject self, PyObject f)
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	1239 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1240 Py_ssize_t nbytes = Py_SIZE(self) * self->ob_descr->itemsize;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1241 /* Write 64K blocks at a time */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1242 /* XXX Make the block size settable */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1243 int BLOCKSIZE = 64*1024;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1244 Py_ssize_t nblocks = (nbytes + BLOCKSIZE - 1) / BLOCKSIZE;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1245 Py_ssize_t i;
27044 23280a64288e SF patch 660559: Use METH_O and METH_NOARGS where possible Raymond Hettinger <python@rcn.com> parents: 24471 diff changeset	1246
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1247 if (Py_SIZE(self) == 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1248 goto done;
41434 f390793e75de Make array().tofile() work with a new I/O object. Guido van Rossum <guido@python.org> parents: 40737 diff changeset	1249
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1250 for (i = 0; i < nblocks; i++) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1251 char* ptr = self->ob_item + i*BLOCKSIZE;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1252 Py_ssize_t size = BLOCKSIZE;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1253 PyObject bytes, res;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1254 if (i*BLOCKSIZE + size > nbytes)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1255 size = nbytes - i*BLOCKSIZE;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1256 bytes = PyBytes_FromStringAndSize(ptr, size);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1257 if (bytes == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1258 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1259 res = PyObject_CallMethod(f, "write", "O", bytes);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1260 Py_DECREF(bytes);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1261 if (res == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1262 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1263 Py_DECREF(res); /* drop write result */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1264 }
41434 f390793e75de Make array().tofile() work with a new I/O object. Guido van Rossum <guido@python.org> parents: 40737 diff changeset	1265
f390793e75de Make array().tofile() work with a new I/O object. Guido van Rossum <guido@python.org> parents: 40737 diff changeset	1266 done:
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1267 Py_INCREF(Py_None);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1268 return Py_None;
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	1269 }
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	1270
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23433 diff changeset	1271 PyDoc_STRVAR(tofile_doc,
9343 4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	1272 "tofile(f)\n\
4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	1273 \n\
45083 c66da57b9488 Remove the deprecated array.read/write methods. Georg Brandl <georg@python.org> parents: 44351 diff changeset	1274 Write all items (as machine values) to the file object f.");
9343 4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	1275
4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	1276
4628 7df5d4cf8277 Renamed Grandly (I think). Roger E. Masse <rmasse@newcnri.cnri.reston.va.us> parents: 4600 diff changeset	1277 static PyObject *
27044 23280a64288e SF patch 660559: Use METH_O and METH_NOARGS where possible Raymond Hettinger <python@rcn.com> parents: 24471 diff changeset	1278 array_fromlist(arrayobject self, PyObject list)
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	1279 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1280 Py_ssize_t n;
27044 23280a64288e SF patch 660559: Use METH_O and METH_NOARGS where possible Raymond Hettinger <python@rcn.com> parents: 24471 diff changeset	1281
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1282 if (!PyList_Check(list)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1283 PyErr_SetString(PyExc_TypeError, "arg must be list");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1284 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1285 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1286 n = PyList_Size(list);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1287 if (n > 0) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1288 Py_ssize_t i, old_size;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1289 old_size = Py_SIZE(self);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1290 if (array_resize(self, old_size + n) == -1)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1291 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1292 for (i = 0; i < n; i++) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1293 PyObject *v = PyList_GetItem(list, i);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1294 if ((*self->ob_descr->setitem)(self,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1295 Py_SIZE(self) - n + i, v) != 0) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1296 array_resize(self, old_size);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1297 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1298 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1299 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1300 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1301 Py_INCREF(Py_None);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1302 return Py_None;
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	1303 }
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	1304
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23433 diff changeset	1305 PyDoc_STRVAR(fromlist_doc,
9343 4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	1306 "fromlist(list)\n\
4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	1307 \n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23433 diff changeset	1308 Append items to array from list.");
9343 4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	1309
4628 7df5d4cf8277 Renamed Grandly (I think). Roger E. Masse <rmasse@newcnri.cnri.reston.va.us> parents: 4600 diff changeset	1310 static PyObject *
27044 23280a64288e SF patch 660559: Use METH_O and METH_NOARGS where possible Raymond Hettinger <python@rcn.com> parents: 24471 diff changeset	1311 array_tolist(arrayobject self, PyObject unused)
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	1312 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1313 PyObject *list = PyList_New(Py_SIZE(self));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1314 Py_ssize_t i;
27044 23280a64288e SF patch 660559: Use METH_O and METH_NOARGS where possible Raymond Hettinger <python@rcn.com> parents: 24471 diff changeset	1315
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1316 if (list == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1317 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1318 for (i = 0; i < Py_SIZE(self); i++) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1319 PyObject v = getarrayitem((PyObject )self, i);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1320 if (v == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1321 Py_DECREF(list);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1322 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1323 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1324 PyList_SetItem(list, i, v);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1325 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1326 return list;
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	1327 }
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	1328
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23433 diff changeset	1329 PyDoc_STRVAR(tolist_doc,
9360 4c23ae6c6e82 ACK! There was still an unescaped newline in a docstring. Guido van Rossum <guido@python.org> parents: 9343 diff changeset	1330 "tolist() -> list\n\
9343 4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	1331 \n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23433 diff changeset	1332 Convert array to an ordinary list with the same items.");
9343 4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	1333
4628 7df5d4cf8277 Renamed Grandly (I think). Roger E. Masse <rmasse@newcnri.cnri.reston.va.us> parents: 4600 diff changeset	1334 static PyObject *
64355 fa8b57f987c5 Issue #8990: array.fromstring() and array.tostring() get renamed to Antoine Pitrou <solipsis@pitrou.net> parents: 63764 diff changeset	1335 frombytes(arrayobject self, Py_buffer buffer)
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	1336 {
64355 fa8b57f987c5 Issue #8990: array.fromstring() and array.tostring() get renamed to Antoine Pitrou <solipsis@pitrou.net> parents: 63764 diff changeset	1337 int itemsize = self->ob_descr->itemsize;
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1338 Py_ssize_t n;
64355 fa8b57f987c5 Issue #8990: array.fromstring() and array.tostring() get renamed to Antoine Pitrou <solipsis@pitrou.net> parents: 63764 diff changeset	1339 if (buffer->itemsize != 1) {
fa8b57f987c5 Issue #8990: array.fromstring() and array.tostring() get renamed to Antoine Pitrou <solipsis@pitrou.net> parents: 63764 diff changeset	1340 PyBuffer_Release(buffer);
fa8b57f987c5 Issue #8990: array.fromstring() and array.tostring() get renamed to Antoine Pitrou <solipsis@pitrou.net> parents: 63764 diff changeset	1341 PyErr_SetString(PyExc_TypeError, "string/buffer of bytes required.");
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1342 return NULL;
64355 fa8b57f987c5 Issue #8990: array.fromstring() and array.tostring() get renamed to Antoine Pitrou <solipsis@pitrou.net> parents: 63764 diff changeset	1343 }
fa8b57f987c5 Issue #8990: array.fromstring() and array.tostring() get renamed to Antoine Pitrou <solipsis@pitrou.net> parents: 63764 diff changeset	1344 n = buffer->len;
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1345 if (n % itemsize != 0) {
64355 fa8b57f987c5 Issue #8990: array.fromstring() and array.tostring() get renamed to Antoine Pitrou <solipsis@pitrou.net> parents: 63764 diff changeset	1346 PyBuffer_Release(buffer);
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1347 PyErr_SetString(PyExc_ValueError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1348 "string length not a multiple of item size");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1349 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1350 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1351 n = n / itemsize;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1352 if (n > 0) {
64355 fa8b57f987c5 Issue #8990: array.fromstring() and array.tostring() get renamed to Antoine Pitrou <solipsis@pitrou.net> parents: 63764 diff changeset	1353 Py_ssize_t old_size = Py_SIZE(self);
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1354 if ((n > PY_SSIZE_T_MAX - old_size) \|\|
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1355 ((old_size + n) > PY_SSIZE_T_MAX / itemsize)) {
64355 fa8b57f987c5 Issue #8990: array.fromstring() and array.tostring() get renamed to Antoine Pitrou <solipsis@pitrou.net> parents: 63764 diff changeset	1356 PyBuffer_Release(buffer);
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1357 return PyErr_NoMemory();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1358 }
64355 fa8b57f987c5 Issue #8990: array.fromstring() and array.tostring() get renamed to Antoine Pitrou <solipsis@pitrou.net> parents: 63764 diff changeset	1359 if (array_resize(self, old_size + n) == -1) {
fa8b57f987c5 Issue #8990: array.fromstring() and array.tostring() get renamed to Antoine Pitrou <solipsis@pitrou.net> parents: 63764 diff changeset	1360 PyBuffer_Release(buffer);
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1361 return NULL;
64355 fa8b57f987c5 Issue #8990: array.fromstring() and array.tostring() get renamed to Antoine Pitrou <solipsis@pitrou.net> parents: 63764 diff changeset	1362 }
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1363 memcpy(self->ob_item + old_size * itemsize,
64355 fa8b57f987c5 Issue #8990: array.fromstring() and array.tostring() get renamed to Antoine Pitrou <solipsis@pitrou.net> parents: 63764 diff changeset	1364 buffer->buf, n * itemsize);
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1365 }
64355 fa8b57f987c5 Issue #8990: array.fromstring() and array.tostring() get renamed to Antoine Pitrou <solipsis@pitrou.net> parents: 63764 diff changeset	1366 PyBuffer_Release(buffer);
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1367 Py_INCREF(Py_None);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1368 return Py_None;
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	1369 }
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	1370
64355 fa8b57f987c5 Issue #8990: array.fromstring() and array.tostring() get renamed to Antoine Pitrou <solipsis@pitrou.net> parents: 63764 diff changeset	1371 static PyObject *
fa8b57f987c5 Issue #8990: array.fromstring() and array.tostring() get renamed to Antoine Pitrou <solipsis@pitrou.net> parents: 63764 diff changeset	1372 array_fromstring(arrayobject self, PyObject args)
fa8b57f987c5 Issue #8990: array.fromstring() and array.tostring() get renamed to Antoine Pitrou <solipsis@pitrou.net> parents: 63764 diff changeset	1373 {
fa8b57f987c5 Issue #8990: array.fromstring() and array.tostring() get renamed to Antoine Pitrou <solipsis@pitrou.net> parents: 63764 diff changeset	1374 Py_buffer buffer;
fa8b57f987c5 Issue #8990: array.fromstring() and array.tostring() get renamed to Antoine Pitrou <solipsis@pitrou.net> parents: 63764 diff changeset	1375 if (PyErr_WarnEx(PyExc_DeprecationWarning,
fa8b57f987c5 Issue #8990: array.fromstring() and array.tostring() get renamed to Antoine Pitrou <solipsis@pitrou.net> parents: 63764 diff changeset	1376 "fromstring() is deprecated. Use frombytes() instead.", 2) != 0)
fa8b57f987c5 Issue #8990: array.fromstring() and array.tostring() get renamed to Antoine Pitrou <solipsis@pitrou.net> parents: 63764 diff changeset	1377 return NULL;
fa8b57f987c5 Issue #8990: array.fromstring() and array.tostring() get renamed to Antoine Pitrou <solipsis@pitrou.net> parents: 63764 diff changeset	1378 if (!PyArg_ParseTuple(args, "s*:fromstring", &buffer))
fa8b57f987c5 Issue #8990: array.fromstring() and array.tostring() get renamed to Antoine Pitrou <solipsis@pitrou.net> parents: 63764 diff changeset	1379 return NULL;
fa8b57f987c5 Issue #8990: array.fromstring() and array.tostring() get renamed to Antoine Pitrou <solipsis@pitrou.net> parents: 63764 diff changeset	1380 else
fa8b57f987c5 Issue #8990: array.fromstring() and array.tostring() get renamed to Antoine Pitrou <solipsis@pitrou.net> parents: 63764 diff changeset	1381 return frombytes(self, &buffer);
fa8b57f987c5 Issue #8990: array.fromstring() and array.tostring() get renamed to Antoine Pitrou <solipsis@pitrou.net> parents: 63764 diff changeset	1382 }
fa8b57f987c5 Issue #8990: array.fromstring() and array.tostring() get renamed to Antoine Pitrou <solipsis@pitrou.net> parents: 63764 diff changeset	1383
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23433 diff changeset	1384 PyDoc_STRVAR(fromstring_doc,
9343 4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	1385 "fromstring(string)\n\
4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	1386 \n\
4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	1387 Appends items from the string, interpreting it as an array of machine\n\
64355 fa8b57f987c5 Issue #8990: array.fromstring() and array.tostring() get renamed to Antoine Pitrou <solipsis@pitrou.net> parents: 63764 diff changeset	1388 values, as if it had been read from a file using the fromfile() method).\n\
fa8b57f987c5 Issue #8990: array.fromstring() and array.tostring() get renamed to Antoine Pitrou <solipsis@pitrou.net> parents: 63764 diff changeset	1389 \n\
fa8b57f987c5 Issue #8990: array.fromstring() and array.tostring() get renamed to Antoine Pitrou <solipsis@pitrou.net> parents: 63764 diff changeset	1390 This method is deprecated. Use frombytes instead.");
fa8b57f987c5 Issue #8990: array.fromstring() and array.tostring() get renamed to Antoine Pitrou <solipsis@pitrou.net> parents: 63764 diff changeset	1391
fa8b57f987c5 Issue #8990: array.fromstring() and array.tostring() get renamed to Antoine Pitrou <solipsis@pitrou.net> parents: 63764 diff changeset	1392
fa8b57f987c5 Issue #8990: array.fromstring() and array.tostring() get renamed to Antoine Pitrou <solipsis@pitrou.net> parents: 63764 diff changeset	1393 static PyObject *
fa8b57f987c5 Issue #8990: array.fromstring() and array.tostring() get renamed to Antoine Pitrou <solipsis@pitrou.net> parents: 63764 diff changeset	1394 array_frombytes(arrayobject self, PyObject args)
fa8b57f987c5 Issue #8990: array.fromstring() and array.tostring() get renamed to Antoine Pitrou <solipsis@pitrou.net> parents: 63764 diff changeset	1395 {
fa8b57f987c5 Issue #8990: array.fromstring() and array.tostring() get renamed to Antoine Pitrou <solipsis@pitrou.net> parents: 63764 diff changeset	1396 Py_buffer buffer;
fa8b57f987c5 Issue #8990: array.fromstring() and array.tostring() get renamed to Antoine Pitrou <solipsis@pitrou.net> parents: 63764 diff changeset	1397 if (!PyArg_ParseTuple(args, "y*:frombytes", &buffer))
fa8b57f987c5 Issue #8990: array.fromstring() and array.tostring() get renamed to Antoine Pitrou <solipsis@pitrou.net> parents: 63764 diff changeset	1398 return NULL;
fa8b57f987c5 Issue #8990: array.fromstring() and array.tostring() get renamed to Antoine Pitrou <solipsis@pitrou.net> parents: 63764 diff changeset	1399 else
fa8b57f987c5 Issue #8990: array.fromstring() and array.tostring() get renamed to Antoine Pitrou <solipsis@pitrou.net> parents: 63764 diff changeset	1400 return frombytes(self, &buffer);
fa8b57f987c5 Issue #8990: array.fromstring() and array.tostring() get renamed to Antoine Pitrou <solipsis@pitrou.net> parents: 63764 diff changeset	1401 }
fa8b57f987c5 Issue #8990: array.fromstring() and array.tostring() get renamed to Antoine Pitrou <solipsis@pitrou.net> parents: 63764 diff changeset	1402
fa8b57f987c5 Issue #8990: array.fromstring() and array.tostring() get renamed to Antoine Pitrou <solipsis@pitrou.net> parents: 63764 diff changeset	1403 PyDoc_STRVAR(frombytes_doc,
fa8b57f987c5 Issue #8990: array.fromstring() and array.tostring() get renamed to Antoine Pitrou <solipsis@pitrou.net> parents: 63764 diff changeset	1404 "frombytes(bytestring)\n\
fa8b57f987c5 Issue #8990: array.fromstring() and array.tostring() get renamed to Antoine Pitrou <solipsis@pitrou.net> parents: 63764 diff changeset	1405 \n\
fa8b57f987c5 Issue #8990: array.fromstring() and array.tostring() get renamed to Antoine Pitrou <solipsis@pitrou.net> parents: 63764 diff changeset	1406 Appends items from the string, interpreting it as an array of machine\n\
42125 79c2656056f6 Make array.typecode a unicode string. Walter Dörwald <walter@livinglogic.de> parents: 42112 diff changeset	1407 values, as if it had been read from a file using the fromfile() method).");
9343 4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	1408
4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	1409
4628 7df5d4cf8277 Renamed Grandly (I think). Roger E. Masse <rmasse@newcnri.cnri.reston.va.us> parents: 4600 diff changeset	1410 static PyObject *
64355 fa8b57f987c5 Issue #8990: array.fromstring() and array.tostring() get renamed to Antoine Pitrou <solipsis@pitrou.net> parents: 63764 diff changeset	1411 array_tobytes(arrayobject self, PyObject unused)
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	1412 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1413 if (Py_SIZE(self) <= PY_SSIZE_T_MAX / self->ob_descr->itemsize) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1414 return PyBytes_FromStringAndSize(self->ob_item,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1415 Py_SIZE(self) * self->ob_descr->itemsize);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1416 } else {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1417 return PyErr_NoMemory();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1418 }
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	1419 }
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	1420
64355 fa8b57f987c5 Issue #8990: array.fromstring() and array.tostring() get renamed to Antoine Pitrou <solipsis@pitrou.net> parents: 63764 diff changeset	1421 PyDoc_STRVAR(tobytes_doc,
fa8b57f987c5 Issue #8990: array.fromstring() and array.tostring() get renamed to Antoine Pitrou <solipsis@pitrou.net> parents: 63764 diff changeset	1422 "tobytes() -> bytes\n\
9343 4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	1423 \n\
64355 fa8b57f987c5 Issue #8990: array.fromstring() and array.tostring() get renamed to Antoine Pitrou <solipsis@pitrou.net> parents: 63764 diff changeset	1424 Convert the array to an array of machine values and return the bytes\n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23433 diff changeset	1425 representation.");
9343 4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	1426
22098 966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	1427
64355 fa8b57f987c5 Issue #8990: array.fromstring() and array.tostring() get renamed to Antoine Pitrou <solipsis@pitrou.net> parents: 63764 diff changeset	1428 static PyObject *
fa8b57f987c5 Issue #8990: array.fromstring() and array.tostring() get renamed to Antoine Pitrou <solipsis@pitrou.net> parents: 63764 diff changeset	1429 array_tostring(arrayobject self, PyObject unused)
fa8b57f987c5 Issue #8990: array.fromstring() and array.tostring() get renamed to Antoine Pitrou <solipsis@pitrou.net> parents: 63764 diff changeset	1430 {
fa8b57f987c5 Issue #8990: array.fromstring() and array.tostring() get renamed to Antoine Pitrou <solipsis@pitrou.net> parents: 63764 diff changeset	1431 if (PyErr_WarnEx(PyExc_DeprecationWarning,
fa8b57f987c5 Issue #8990: array.fromstring() and array.tostring() get renamed to Antoine Pitrou <solipsis@pitrou.net> parents: 63764 diff changeset	1432 "tostring() is deprecated. Use tobytes() instead.", 2) != 0)
fa8b57f987c5 Issue #8990: array.fromstring() and array.tostring() get renamed to Antoine Pitrou <solipsis@pitrou.net> parents: 63764 diff changeset	1433 return NULL;
fa8b57f987c5 Issue #8990: array.fromstring() and array.tostring() get renamed to Antoine Pitrou <solipsis@pitrou.net> parents: 63764 diff changeset	1434 return array_tobytes(self, unused);
fa8b57f987c5 Issue #8990: array.fromstring() and array.tostring() get renamed to Antoine Pitrou <solipsis@pitrou.net> parents: 63764 diff changeset	1435 }
fa8b57f987c5 Issue #8990: array.fromstring() and array.tostring() get renamed to Antoine Pitrou <solipsis@pitrou.net> parents: 63764 diff changeset	1436
fa8b57f987c5 Issue #8990: array.fromstring() and array.tostring() get renamed to Antoine Pitrou <solipsis@pitrou.net> parents: 63764 diff changeset	1437 PyDoc_STRVAR(tostring_doc,
fa8b57f987c5 Issue #8990: array.fromstring() and array.tostring() get renamed to Antoine Pitrou <solipsis@pitrou.net> parents: 63764 diff changeset	1438 "tostring() -> bytes\n\
fa8b57f987c5 Issue #8990: array.fromstring() and array.tostring() get renamed to Antoine Pitrou <solipsis@pitrou.net> parents: 63764 diff changeset	1439 \n\
fa8b57f987c5 Issue #8990: array.fromstring() and array.tostring() get renamed to Antoine Pitrou <solipsis@pitrou.net> parents: 63764 diff changeset	1440 Convert the array to an array of machine values and return the bytes\n\
fa8b57f987c5 Issue #8990: array.fromstring() and array.tostring() get renamed to Antoine Pitrou <solipsis@pitrou.net> parents: 63764 diff changeset	1441 representation.\n\
fa8b57f987c5 Issue #8990: array.fromstring() and array.tostring() get renamed to Antoine Pitrou <solipsis@pitrou.net> parents: 63764 diff changeset	1442 \n\
fa8b57f987c5 Issue #8990: array.fromstring() and array.tostring() get renamed to Antoine Pitrou <solipsis@pitrou.net> parents: 63764 diff changeset	1443 This method is deprecated. Use tobytes instead.");
fa8b57f987c5 Issue #8990: array.fromstring() and array.tostring() get renamed to Antoine Pitrou <solipsis@pitrou.net> parents: 63764 diff changeset	1444
22098 966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	1445
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	1446 static PyObject *
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	1447 array_fromunicode(arrayobject self, PyObject args)
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	1448 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1449 Py_UNICODE *ustr;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1450 Py_ssize_t n;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1451 char typecode;
22098 966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	1452
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1453 if (!PyArg_ParseTuple(args, "u#:fromunicode", &ustr, &n))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1454 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1455 typecode = self->ob_descr->typecode;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1456 if ((typecode != 'u')) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1457 PyErr_SetString(PyExc_ValueError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1458 "fromunicode() may only be called on "
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1459 "unicode type arrays");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1460 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1461 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1462 if (n > 0) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1463 Py_ssize_t old_size = Py_SIZE(self);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1464 if (array_resize(self, old_size + n) == -1)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1465 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1466 memcpy(self->ob_item + old_size * sizeof(Py_UNICODE),
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1467 ustr, n * sizeof(Py_UNICODE));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1468 }
22098 966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	1469
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1470 Py_INCREF(Py_None);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1471 return Py_None;
22098 966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	1472 }
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	1473
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23433 diff changeset	1474 PyDoc_STRVAR(fromunicode_doc,
22098 966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	1475 "fromunicode(ustr)\n\
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	1476 \n\
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	1477 Extends this array with data from the unicode string ustr.\n\
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: 42540 diff changeset	1478 The array must be a unicode type array; otherwise a ValueError\n\
64355 fa8b57f987c5 Issue #8990: array.fromstring() and array.tostring() get renamed to Antoine Pitrou <solipsis@pitrou.net> parents: 63764 diff changeset	1479 is raised. Use array.frombytes(ustr.decode(...)) to\n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23433 diff changeset	1480 append Unicode data to an array of some other type.");
22098 966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	1481
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	1482
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	1483 static PyObject *
27044 23280a64288e SF patch 660559: Use METH_O and METH_NOARGS where possible Raymond Hettinger <python@rcn.com> parents: 24471 diff changeset	1484 array_tounicode(arrayobject self, PyObject unused)
22098 966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	1485 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1486 char typecode;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1487 typecode = self->ob_descr->typecode;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1488 if ((typecode != 'u')) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1489 PyErr_SetString(PyExc_ValueError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1490 "tounicode() may only be called on unicode type arrays");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1491 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1492 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1493 return PyUnicode_FromUnicode((Py_UNICODE *) self->ob_item, Py_SIZE(self));
22098 966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	1494 }
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	1495
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23433 diff changeset	1496 PyDoc_STRVAR(tounicode_doc,
22098 966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	1497 "tounicode() -> unicode\n\
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	1498 \n\
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	1499 Convert the array to a unicode string. The array must be\n\
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: 42540 diff changeset	1500 a unicode type array; otherwise a ValueError is raised. Use\n\
22098 966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	1501 array.tostring().decode() to obtain a unicode string from\n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23433 diff changeset	1502 an array of some other type.");
22098 966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	1503
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	1504
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	1505
55259 edc714ffe6cc Issue #2389: Implement a portable mechanism for pickling array objects. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55204 diff changeset	1506 /********************* Pickling support **********************/
edc714ffe6cc Issue #2389: Implement a portable mechanism for pickling array objects. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55204 diff changeset	1507
edc714ffe6cc Issue #2389: Implement a portable mechanism for pickling array objects. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55204 diff changeset	1508 enum machine_format_code {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1509 UNKNOWN_FORMAT = -1,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1510 /* UNKNOWN_FORMAT is used to indicate that the machine format for an
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1511 * array type code cannot be interpreted. When this occurs, a list of
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1512 * Python objects is used to represent the content of the array
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1513 * instead of using the memory content of the array directly. In that
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1514 * case, the array_reconstructor mechanism is bypassed completely, and
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1515 * the standard array constructor is used instead.
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1516 *
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1517 * This is will most likely occur when the machine doesn't use IEEE
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1518 * floating-point numbers.
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1519 */
55259 edc714ffe6cc Issue #2389: Implement a portable mechanism for pickling array objects. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55204 diff changeset	1520
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1521 UNSIGNED_INT8 = 0,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1522 SIGNED_INT8 = 1,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1523 UNSIGNED_INT16_LE = 2,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1524 UNSIGNED_INT16_BE = 3,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1525 SIGNED_INT16_LE = 4,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1526 SIGNED_INT16_BE = 5,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1527 UNSIGNED_INT32_LE = 6,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1528 UNSIGNED_INT32_BE = 7,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1529 SIGNED_INT32_LE = 8,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1530 SIGNED_INT32_BE = 9,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1531 UNSIGNED_INT64_LE = 10,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1532 UNSIGNED_INT64_BE = 11,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1533 SIGNED_INT64_LE = 12,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1534 SIGNED_INT64_BE = 13,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1535 IEEE_754_FLOAT_LE = 14,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1536 IEEE_754_FLOAT_BE = 15,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1537 IEEE_754_DOUBLE_LE = 16,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1538 IEEE_754_DOUBLE_BE = 17,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1539 UTF16_LE = 18,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1540 UTF16_BE = 19,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1541 UTF32_LE = 20,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1542 UTF32_BE = 21
55259 edc714ffe6cc Issue #2389: Implement a portable mechanism for pickling array objects. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55204 diff changeset	1543 };
edc714ffe6cc Issue #2389: Implement a portable mechanism for pickling array objects. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55204 diff changeset	1544 #define MACHINE_FORMAT_CODE_MIN 0
edc714ffe6cc Issue #2389: Implement a portable mechanism for pickling array objects. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55204 diff changeset	1545 #define MACHINE_FORMAT_CODE_MAX 21
edc714ffe6cc Issue #2389: Implement a portable mechanism for pickling array objects. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55204 diff changeset	1546
edc714ffe6cc Issue #2389: Implement a portable mechanism for pickling array objects. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55204 diff changeset	1547 static const struct mformatdescr {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1548 size_t size;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1549 int is_signed;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1550 int is_big_endian;
55259 edc714ffe6cc Issue #2389: Implement a portable mechanism for pickling array objects. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55204 diff changeset	1551 } mformat_descriptors[] = {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1552 {1, 0, 0}, /* 0: UNSIGNED_INT8 */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1553 {1, 1, 0}, /* 1: SIGNED_INT8 */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1554 {2, 0, 0}, /* 2: UNSIGNED_INT16_LE */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1555 {2, 0, 1}, /* 3: UNSIGNED_INT16_BE */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1556 {2, 1, 0}, /* 4: SIGNED_INT16_LE */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1557 {2, 1, 1}, /* 5: SIGNED_INT16_BE */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1558 {4, 0, 0}, /* 6: UNSIGNED_INT32_LE */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1559 {4, 0, 1}, /* 7: UNSIGNED_INT32_BE */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1560 {4, 1, 0}, /* 8: SIGNED_INT32_LE */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1561 {4, 1, 1}, /* 9: SIGNED_INT32_BE */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1562 {8, 0, 0}, /* 10: UNSIGNED_INT64_LE */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1563 {8, 0, 1}, /* 11: UNSIGNED_INT64_BE */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1564 {8, 1, 0}, /* 12: SIGNED_INT64_LE */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1565 {8, 1, 1}, /* 13: SIGNED_INT64_BE */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1566 {4, 0, 0}, /* 14: IEEE_754_FLOAT_LE */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1567 {4, 0, 1}, /* 15: IEEE_754_FLOAT_BE */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1568 {8, 0, 0}, /* 16: IEEE_754_DOUBLE_LE */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1569 {8, 0, 1}, /* 17: IEEE_754_DOUBLE_BE */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1570 {4, 0, 0}, /* 18: UTF16_LE */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1571 {4, 0, 1}, /* 19: UTF16_BE */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1572 {8, 0, 0}, /* 20: UTF32_LE */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1573 {8, 0, 1} /* 21: UTF32_BE */
55259 edc714ffe6cc Issue #2389: Implement a portable mechanism for pickling array objects. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55204 diff changeset	1574 };
edc714ffe6cc Issue #2389: Implement a portable mechanism for pickling array objects. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55204 diff changeset	1575
edc714ffe6cc Issue #2389: Implement a portable mechanism for pickling array objects. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55204 diff changeset	1576
edc714ffe6cc Issue #2389: Implement a portable mechanism for pickling array objects. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55204 diff changeset	1577 /*
edc714ffe6cc Issue #2389: Implement a portable mechanism for pickling array objects. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55204 diff changeset	1578 * Internal: This function is used to find the machine format of a given
edc714ffe6cc Issue #2389: Implement a portable mechanism for pickling array objects. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55204 diff changeset	1579 * array type code. This returns UNKNOWN_FORMAT when the machine format cannot
edc714ffe6cc Issue #2389: Implement a portable mechanism for pickling array objects. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55204 diff changeset	1580 * be found.
edc714ffe6cc Issue #2389: Implement a portable mechanism for pickling array objects. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55204 diff changeset	1581 */
edc714ffe6cc Issue #2389: Implement a portable mechanism for pickling array objects. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55204 diff changeset	1582 static enum machine_format_code
edc714ffe6cc Issue #2389: Implement a portable mechanism for pickling array objects. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55204 diff changeset	1583 typecode_to_mformat_code(int typecode)
edc714ffe6cc Issue #2389: Implement a portable mechanism for pickling array objects. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55204 diff changeset	1584 {
55276 fc8fb8eff20e Use the proper autoconf macro for checking byte order. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55261 diff changeset	1585 #ifdef WORDS_BIGENDIAN
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1586 const int is_big_endian = 1;
55259 edc714ffe6cc Issue #2389: Implement a portable mechanism for pickling array objects. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55204 diff changeset	1587 #else
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1588 const int is_big_endian = 0;
55259 edc714ffe6cc Issue #2389: Implement a portable mechanism for pickling array objects. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55204 diff changeset	1589 #endif
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1590 size_t intsize;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1591 int is_signed;
55259 edc714ffe6cc Issue #2389: Implement a portable mechanism for pickling array objects. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55204 diff changeset	1592
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1593 switch (typecode) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1594 case 'b':
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1595 return SIGNED_INT8;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1596 case 'B':
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1597 return UNSIGNED_INT8;
55259 edc714ffe6cc Issue #2389: Implement a portable mechanism for pickling array objects. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55204 diff changeset	1598
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1599 case 'u':
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1600 if (sizeof(Py_UNICODE) == 2) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1601 return UTF16_LE + is_big_endian;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1602 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1603 if (sizeof(Py_UNICODE) == 4) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1604 return UTF32_LE + is_big_endian;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1605 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1606 return UNKNOWN_FORMAT;
55259 edc714ffe6cc Issue #2389: Implement a portable mechanism for pickling array objects. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55204 diff changeset	1607
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1608 case 'f':
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1609 if (sizeof(float) == 4) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1610 const float y = 16711938.0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1611 if (memcmp(&y, "\x4b\x7f\x01\x02", 4) == 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1612 return IEEE_754_FLOAT_BE;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1613 if (memcmp(&y, "\x02\x01\x7f\x4b", 4) == 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1614 return IEEE_754_FLOAT_LE;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1615 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1616 return UNKNOWN_FORMAT;
55259 edc714ffe6cc Issue #2389: Implement a portable mechanism for pickling array objects. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55204 diff changeset	1617
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1618 case 'd':
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1619 if (sizeof(double) == 8) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1620 const double x = 9006104071832581.0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1621 if (memcmp(&x, "\x43\x3f\xff\x01\x02\x03\x04\x05", 8) == 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1622 return IEEE_754_DOUBLE_BE;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1623 if (memcmp(&x, "\x05\x04\x03\x02\x01\xff\x3f\x43", 8) == 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1624 return IEEE_754_DOUBLE_LE;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1625 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1626 return UNKNOWN_FORMAT;
55259 edc714ffe6cc Issue #2389: Implement a portable mechanism for pickling array objects. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55204 diff changeset	1627
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1628 /* Integers */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1629 case 'h':
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1630 intsize = sizeof(short);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1631 is_signed = 1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1632 break;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1633 case 'H':
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1634 intsize = sizeof(short);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1635 is_signed = 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1636 break;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1637 case 'i':
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1638 intsize = sizeof(int);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1639 is_signed = 1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1640 break;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1641 case 'I':
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1642 intsize = sizeof(int);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1643 is_signed = 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1644 break;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1645 case 'l':
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1646 intsize = sizeof(long);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1647 is_signed = 1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1648 break;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1649 case 'L':
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1650 intsize = sizeof(long);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1651 is_signed = 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1652 break;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1653 default:
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1654 return UNKNOWN_FORMAT;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1655 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1656 switch (intsize) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1657 case 2:
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1658 return UNSIGNED_INT16_LE + is_big_endian + (2 * is_signed);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1659 case 4:
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1660 return UNSIGNED_INT32_LE + is_big_endian + (2 * is_signed);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1661 case 8:
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1662 return UNSIGNED_INT64_LE + is_big_endian + (2 * is_signed);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1663 default:
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1664 return UNKNOWN_FORMAT;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1665 }
55259 edc714ffe6cc Issue #2389: Implement a portable mechanism for pickling array objects. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55204 diff changeset	1666 }
edc714ffe6cc Issue #2389: Implement a portable mechanism for pickling array objects. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55204 diff changeset	1667
edc714ffe6cc Issue #2389: Implement a portable mechanism for pickling array objects. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55204 diff changeset	1668 /* Forward declaration. */
edc714ffe6cc Issue #2389: Implement a portable mechanism for pickling array objects. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55204 diff changeset	1669 static PyObject array_new(PyTypeObject type, PyObject args, PyObject kwds);
edc714ffe6cc Issue #2389: Implement a portable mechanism for pickling array objects. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55204 diff changeset	1670
edc714ffe6cc Issue #2389: Implement a portable mechanism for pickling array objects. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55204 diff changeset	1671 /*
edc714ffe6cc Issue #2389: Implement a portable mechanism for pickling array objects. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55204 diff changeset	1672 * Internal: This function wraps the array constructor--i.e., array_new()--to
edc714ffe6cc Issue #2389: Implement a portable mechanism for pickling array objects. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55204 diff changeset	1673 * allow the creation of array objects from C code without having to deal
edc714ffe6cc Issue #2389: Implement a portable mechanism for pickling array objects. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55204 diff changeset	1674 * directly the tuple argument of array_new(). The typecode argument is a
edc714ffe6cc Issue #2389: Implement a portable mechanism for pickling array objects. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55204 diff changeset	1675 * Unicode character value, like 'i' or 'f' for example, representing an array
edc714ffe6cc Issue #2389: Implement a portable mechanism for pickling array objects. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55204 diff changeset	1676 * type code. The items argument is a bytes or a list object from which
edc714ffe6cc Issue #2389: Implement a portable mechanism for pickling array objects. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55204 diff changeset	1677 * contains the initial value of the array.
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1678 *
55259 edc714ffe6cc Issue #2389: Implement a portable mechanism for pickling array objects. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55204 diff changeset	1679 * On success, this functions returns the array object created. Otherwise,
edc714ffe6cc Issue #2389: Implement a portable mechanism for pickling array objects. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55204 diff changeset	1680 * NULL is returned to indicate a failure.
edc714ffe6cc Issue #2389: Implement a portable mechanism for pickling array objects. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55204 diff changeset	1681 */
edc714ffe6cc Issue #2389: Implement a portable mechanism for pickling array objects. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55204 diff changeset	1682 static PyObject *
edc714ffe6cc Issue #2389: Implement a portable mechanism for pickling array objects. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55204 diff changeset	1683 make_array(PyTypeObject arraytype, int typecode, PyObject items)
edc714ffe6cc Issue #2389: Implement a portable mechanism for pickling array objects. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55204 diff changeset	1684 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1685 PyObject *new_args;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1686 PyObject *array_obj;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1687 PyObject *typecode_obj;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1688 Py_UNICODE typecode_str[1] = {typecode};
55259 edc714ffe6cc Issue #2389: Implement a portable mechanism for pickling array objects. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55204 diff changeset	1689
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1690 assert(arraytype != NULL);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1691 assert(items != NULL);
55259 edc714ffe6cc Issue #2389: Implement a portable mechanism for pickling array objects. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55204 diff changeset	1692
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1693 typecode_obj = PyUnicode_FromUnicode(typecode_str, 1);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1694 if (typecode_obj == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1695 return NULL;
55259 edc714ffe6cc Issue #2389: Implement a portable mechanism for pickling array objects. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55204 diff changeset	1696
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1697 new_args = PyTuple_New(2);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1698 if (new_args == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1699 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1700 Py_INCREF(items);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1701 PyTuple_SET_ITEM(new_args, 0, typecode_obj);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1702 PyTuple_SET_ITEM(new_args, 1, items);
55259 edc714ffe6cc Issue #2389: Implement a portable mechanism for pickling array objects. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55204 diff changeset	1703
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1704 array_obj = array_new(arraytype, new_args, NULL);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1705 Py_DECREF(new_args);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1706 if (array_obj == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1707 return NULL;
55259 edc714ffe6cc Issue #2389: Implement a portable mechanism for pickling array objects. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55204 diff changeset	1708
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1709 return array_obj;
55259 edc714ffe6cc Issue #2389: Implement a portable mechanism for pickling array objects. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55204 diff changeset	1710 }
edc714ffe6cc Issue #2389: Implement a portable mechanism for pickling array objects. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55204 diff changeset	1711
edc714ffe6cc Issue #2389: Implement a portable mechanism for pickling array objects. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55204 diff changeset	1712 /*
edc714ffe6cc Issue #2389: Implement a portable mechanism for pickling array objects. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55204 diff changeset	1713 * This functions is a special constructor used when unpickling an array. It
edc714ffe6cc Issue #2389: Implement a portable mechanism for pickling array objects. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55204 diff changeset	1714 * provides a portable way to rebuild an array from its memory representation.
edc714ffe6cc Issue #2389: Implement a portable mechanism for pickling array objects. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55204 diff changeset	1715 */
edc714ffe6cc Issue #2389: Implement a portable mechanism for pickling array objects. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55204 diff changeset	1716 static PyObject *
edc714ffe6cc Issue #2389: Implement a portable mechanism for pickling array objects. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55204 diff changeset	1717 array_reconstructor(PyObject self, PyObject args)
edc714ffe6cc Issue #2389: Implement a portable mechanism for pickling array objects. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55204 diff changeset	1718 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1719 PyTypeObject *arraytype;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1720 PyObject *items;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1721 PyObject *converted_items;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1722 PyObject *result;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1723 int typecode;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1724 enum machine_format_code mformat_code;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1725 struct arraydescr *descr;
55259 edc714ffe6cc Issue #2389: Implement a portable mechanism for pickling array objects. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55204 diff changeset	1726
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1727 if (!PyArg_ParseTuple(args, "OCiO:array._array_reconstructor",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1728 &arraytype, &typecode, &mformat_code, &items))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1729 return NULL;
55259 edc714ffe6cc Issue #2389: Implement a portable mechanism for pickling array objects. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55204 diff changeset	1730
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1731 if (!PyType_Check(arraytype)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1732 PyErr_Format(PyExc_TypeError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1733 "first argument must a type object, not %.200s",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1734 Py_TYPE(arraytype)->tp_name);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1735 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1736 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1737 if (!PyType_IsSubtype(arraytype, &Arraytype)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1738 PyErr_Format(PyExc_TypeError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1739 "%.200s is not a subtype of %.200s",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1740 arraytype->tp_name, Arraytype.tp_name);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1741 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1742 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1743 for (descr = descriptors; descr->typecode != '\0'; descr++) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1744 if (descr->typecode == typecode)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1745 break;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1746 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1747 if (descr->typecode == '\0') {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1748 PyErr_SetString(PyExc_ValueError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1749 "second argument must be a valid type code");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1750 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1751 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1752 if (mformat_code < MACHINE_FORMAT_CODE_MIN \|\|
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1753 mformat_code > MACHINE_FORMAT_CODE_MAX) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1754 PyErr_SetString(PyExc_ValueError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1755 "third argument must be a valid machine format code.");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1756 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1757 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1758 if (!PyBytes_Check(items)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1759 PyErr_Format(PyExc_TypeError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1760 "fourth argument should be bytes, not %.200s",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1761 Py_TYPE(items)->tp_name);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1762 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1763 }
55259 edc714ffe6cc Issue #2389: Implement a portable mechanism for pickling array objects. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55204 diff changeset	1764
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1765 /* Fast path: No decoding has to be done. */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1766 if (mformat_code == typecode_to_mformat_code(typecode) \|\|
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1767 mformat_code == UNKNOWN_FORMAT) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1768 return make_array(arraytype, typecode, items);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1769 }
55259 edc714ffe6cc Issue #2389: Implement a portable mechanism for pickling array objects. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55204 diff changeset	1770
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1771 /* Slow path: Decode the byte string according to the given machine
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1772 * format code. This occurs when the computer unpickling the array
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1773 * object is architecturally different from the one that pickled the
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1774 * array.
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1775 */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1776 if (Py_SIZE(items) % mformat_descriptors[mformat_code].size != 0) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1777 PyErr_SetString(PyExc_ValueError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1778 "string length not a multiple of item size");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1779 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1780 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1781 switch (mformat_code) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1782 case IEEE_754_FLOAT_LE:
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1783 case IEEE_754_FLOAT_BE: {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1784 int i;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1785 int le = (mformat_code == IEEE_754_FLOAT_LE) ? 1 : 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1786 Py_ssize_t itemcount = Py_SIZE(items) / 4;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1787 const unsigned char *memstr =
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1788 (unsigned char *)PyBytes_AS_STRING(items);
55259 edc714ffe6cc Issue #2389: Implement a portable mechanism for pickling array objects. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55204 diff changeset	1789
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1790 converted_items = PyList_New(itemcount);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1791 if (converted_items == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1792 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1793 for (i = 0; i < itemcount; i++) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1794 PyObject *pyfloat = PyFloat_FromDouble(
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1795 _PyFloat_Unpack4(&memstr[i * 4], le));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1796 if (pyfloat == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1797 Py_DECREF(converted_items);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1798 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1799 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1800 PyList_SET_ITEM(converted_items, i, pyfloat);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1801 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1802 break;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1803 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1804 case IEEE_754_DOUBLE_LE:
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1805 case IEEE_754_DOUBLE_BE: {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1806 int i;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1807 int le = (mformat_code == IEEE_754_DOUBLE_LE) ? 1 : 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1808 Py_ssize_t itemcount = Py_SIZE(items) / 8;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1809 const unsigned char *memstr =
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1810 (unsigned char *)PyBytes_AS_STRING(items);
55259 edc714ffe6cc Issue #2389: Implement a portable mechanism for pickling array objects. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55204 diff changeset	1811
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1812 converted_items = PyList_New(itemcount);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1813 if (converted_items == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1814 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1815 for (i = 0; i < itemcount; i++) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1816 PyObject *pyfloat = PyFloat_FromDouble(
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1817 _PyFloat_Unpack8(&memstr[i * 8], le));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1818 if (pyfloat == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1819 Py_DECREF(converted_items);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1820 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1821 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1822 PyList_SET_ITEM(converted_items, i, pyfloat);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1823 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1824 break;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1825 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1826 case UTF16_LE:
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1827 case UTF16_BE: {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1828 int byteorder = (mformat_code == UTF16_LE) ? -1 : 1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1829 converted_items = PyUnicode_DecodeUTF16(
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1830 PyBytes_AS_STRING(items), Py_SIZE(items),
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1831 "strict", &byteorder);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1832 if (converted_items == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1833 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1834 break;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1835 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1836 case UTF32_LE:
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1837 case UTF32_BE: {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1838 int byteorder = (mformat_code == UTF32_LE) ? -1 : 1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1839 converted_items = PyUnicode_DecodeUTF32(
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1840 PyBytes_AS_STRING(items), Py_SIZE(items),
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1841 "strict", &byteorder);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1842 if (converted_items == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1843 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1844 break;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1845 }
55259 edc714ffe6cc Issue #2389: Implement a portable mechanism for pickling array objects. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55204 diff changeset	1846
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1847 case UNSIGNED_INT8:
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1848 case SIGNED_INT8:
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1849 case UNSIGNED_INT16_LE:
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1850 case UNSIGNED_INT16_BE:
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1851 case SIGNED_INT16_LE:
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1852 case SIGNED_INT16_BE:
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1853 case UNSIGNED_INT32_LE:
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1854 case UNSIGNED_INT32_BE:
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1855 case SIGNED_INT32_LE:
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1856 case SIGNED_INT32_BE:
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1857 case UNSIGNED_INT64_LE:
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1858 case UNSIGNED_INT64_BE:
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1859 case SIGNED_INT64_LE:
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1860 case SIGNED_INT64_BE: {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1861 int i;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1862 const struct mformatdescr mf_descr =
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1863 mformat_descriptors[mformat_code];
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1864 Py_ssize_t itemcount = Py_SIZE(items) / mf_descr.size;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1865 const unsigned char *memstr =
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1866 (unsigned char *)PyBytes_AS_STRING(items);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1867 struct arraydescr *descr;
55259 edc714ffe6cc Issue #2389: Implement a portable mechanism for pickling array objects. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55204 diff changeset	1868
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1869 /* If possible, try to pack array's items using a data type
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1870 * that fits better. This may result in an array with narrower
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1871 * or wider elements.
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1872 *
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1873 * For example, if a 32-bit machine pickles a L-code array of
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1874 * unsigned longs, then the array will be unpickled by 64-bit
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1875 * machine as an I-code array of unsigned ints.
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1876 *
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1877 * XXX: Is it possible to write a unit test for this?
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1878 */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1879 for (descr = descriptors; descr->typecode != '\0'; descr++) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1880 if (descr->is_integer_type &&
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1881 descr->itemsize == mf_descr.size &&
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1882 descr->is_signed == mf_descr.is_signed)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1883 typecode = descr->typecode;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1884 }
55259 edc714ffe6cc Issue #2389: Implement a portable mechanism for pickling array objects. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55204 diff changeset	1885
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1886 converted_items = PyList_New(itemcount);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1887 if (converted_items == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1888 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1889 for (i = 0; i < itemcount; i++) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1890 PyObject *pylong;
55259 edc714ffe6cc Issue #2389: Implement a portable mechanism for pickling array objects. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55204 diff changeset	1891
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1892 pylong = _PyLong_FromByteArray(
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1893 &memstr[i * mf_descr.size],
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1894 mf_descr.size,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1895 !mf_descr.is_big_endian,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1896 mf_descr.is_signed);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1897 if (pylong == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1898 Py_DECREF(converted_items);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1899 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1900 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1901 PyList_SET_ITEM(converted_items, i, pylong);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1902 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1903 break;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1904 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1905 case UNKNOWN_FORMAT:
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1906 /* Impossible, but needed to shut up GCC about the unhandled
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1907 * enumeration value.
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1908 */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1909 default:
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1910 PyErr_BadArgument();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1911 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1912 }
55259 edc714ffe6cc Issue #2389: Implement a portable mechanism for pickling array objects. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55204 diff changeset	1913
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1914 result = make_array(arraytype, typecode, converted_items);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1915 Py_DECREF(converted_items);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1916 return result;
55259 edc714ffe6cc Issue #2389: Implement a portable mechanism for pickling array objects. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55204 diff changeset	1917 }
edc714ffe6cc Issue #2389: Implement a portable mechanism for pickling array objects. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55204 diff changeset	1918
edc714ffe6cc Issue #2389: Implement a portable mechanism for pickling array objects. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55204 diff changeset	1919 static PyObject *
edc714ffe6cc Issue #2389: Implement a portable mechanism for pickling array objects. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55204 diff changeset	1920 array_reduce_ex(arrayobject array, PyObject value)
edc714ffe6cc Issue #2389: Implement a portable mechanism for pickling array objects. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55204 diff changeset	1921 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1922 PyObject *dict;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1923 PyObject *result;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1924 PyObject *array_str;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1925 int typecode = array->ob_descr->typecode;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1926 int mformat_code;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1927 static PyObject *array_reconstructor = NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1928 long protocol;
55259 edc714ffe6cc Issue #2389: Implement a portable mechanism for pickling array objects. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55204 diff changeset	1929
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1930 if (array_reconstructor == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1931 PyObject *array_module = PyImport_ImportModule("array");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1932 if (array_module == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1933 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1934 array_reconstructor = PyObject_GetAttrString(
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1935 array_module,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1936 "_array_reconstructor");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1937 Py_DECREF(array_module);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1938 if (array_reconstructor == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1939 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1940 }
55259 edc714ffe6cc Issue #2389: Implement a portable mechanism for pickling array objects. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55204 diff changeset	1941
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1942 if (!PyLong_Check(value)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1943 PyErr_SetString(PyExc_TypeError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1944 "__reduce_ex__ argument should an integer");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1945 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1946 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1947 protocol = PyLong_AsLong(value);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1948 if (protocol == -1 && PyErr_Occurred())
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1949 return NULL;
55259 edc714ffe6cc Issue #2389: Implement a portable mechanism for pickling array objects. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55204 diff changeset	1950
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1951 dict = PyObject_GetAttrString((PyObject *)array, "__dict__");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1952 if (dict == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1953 if (!PyErr_ExceptionMatches(PyExc_AttributeError))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1954 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1955 PyErr_Clear();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1956 dict = Py_None;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1957 Py_INCREF(dict);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1958 }
55259 edc714ffe6cc Issue #2389: Implement a portable mechanism for pickling array objects. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55204 diff changeset	1959
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1960 mformat_code = typecode_to_mformat_code(typecode);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1961 if (mformat_code == UNKNOWN_FORMAT \|\| protocol < 3) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1962 /* Convert the array to a list if we got something weird
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1963 * (e.g., non-IEEE floats), or we are pickling the array using
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1964 * a Python 2.x compatible protocol.
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1965 *
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1966 * It is necessary to use a list representation for Python 2.x
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1967 * compatible pickle protocol, since Python 2's str objects
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1968 * are unpickled as unicode by Python 3. Thus it is impossible
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1969 * to make arrays unpicklable by Python 3 by using their memory
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1970 * representation, unless we resort to ugly hacks such as
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1971 * coercing unicode objects to bytes in array_reconstructor.
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1972 */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1973 PyObject *list;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1974 list = array_tolist(array, NULL);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1975 if (list == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1976 Py_DECREF(dict);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1977 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1978 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1979 result = Py_BuildValue(
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1980 "O(CO)O", Py_TYPE(array), typecode, list, dict);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1981 Py_DECREF(list);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1982 Py_DECREF(dict);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1983 return result;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1984 }
55259 edc714ffe6cc Issue #2389: Implement a portable mechanism for pickling array objects. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55204 diff changeset	1985
64355 fa8b57f987c5 Issue #8990: array.fromstring() and array.tostring() get renamed to Antoine Pitrou <solipsis@pitrou.net> parents: 63764 diff changeset	1986 array_str = array_tobytes(array, NULL);
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1987 if (array_str == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1988 Py_DECREF(dict);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1989 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1990 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1991 result = Py_BuildValue(
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1992 "O(OCiN)O", array_reconstructor, Py_TYPE(array), typecode,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1993 mformat_code, array_str, dict);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1994 Py_DECREF(dict);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	1995 return result;
55259 edc714ffe6cc Issue #2389: Implement a portable mechanism for pickling array objects. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55204 diff changeset	1996 }
edc714ffe6cc Issue #2389: Implement a portable mechanism for pickling array objects. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55204 diff changeset	1997
edc714ffe6cc Issue #2389: Implement a portable mechanism for pickling array objects. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55204 diff changeset	1998 PyDoc_STRVAR(reduce_doc, "Return state information for pickling.");
edc714ffe6cc Issue #2389: Implement a portable mechanism for pickling array objects. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55204 diff changeset	1999
22098 966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	2000 static PyObject *
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	2001 array_get_typecode(arrayobject a, void closure)
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	2002 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2003 char tc = a->ob_descr->typecode;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2004 return PyUnicode_FromStringAndSize(&tc, 1);
22098 966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	2005 }
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	2006
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	2007 static PyObject *
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	2008 array_get_itemsize(arrayobject a, void closure)
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	2009 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2010 return PyLong_FromLong((long)a->ob_descr->itemsize);
22098 966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	2011 }
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	2012
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	2013 static PyGetSetDef array_getsets [] = {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2014 {"typecode", (getter) array_get_typecode, NULL,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2015 "the typecode character used to create the array"},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2016 {"itemsize", (getter) array_get_itemsize, NULL,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2017 "the size, in bytes, of one array item"},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2018 {NULL}
22098 966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	2019 };
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	2020
47680 b5e02775fffc Merged revisions 64226 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47580 diff changeset	2021 static PyMethodDef array_methods[] = {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2022 {"append", (PyCFunction)array_append, METH_O,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2023 append_doc},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2024 {"buffer_info", (PyCFunction)array_buffer_info, METH_NOARGS,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2025 buffer_info_doc},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2026 {"byteswap", (PyCFunction)array_byteswap, METH_NOARGS,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2027 byteswap_doc},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2028 {"__copy__", (PyCFunction)array_copy, METH_NOARGS,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2029 copy_doc},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2030 {"count", (PyCFunction)array_count, METH_O,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2031 count_doc},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2032 {"__deepcopy__",(PyCFunction)array_copy, METH_O,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2033 copy_doc},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2034 {"extend", (PyCFunction)array_extend, METH_O,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2035 extend_doc},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2036 {"fromfile", (PyCFunction)array_fromfile, METH_VARARGS,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2037 fromfile_doc},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2038 {"fromlist", (PyCFunction)array_fromlist, METH_O,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2039 fromlist_doc},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2040 {"fromstring", (PyCFunction)array_fromstring, METH_VARARGS,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2041 fromstring_doc},
64355 fa8b57f987c5 Issue #8990: array.fromstring() and array.tostring() get renamed to Antoine Pitrou <solipsis@pitrou.net> parents: 63764 diff changeset	2042 {"frombytes", (PyCFunction)array_frombytes, METH_VARARGS,
fa8b57f987c5 Issue #8990: array.fromstring() and array.tostring() get renamed to Antoine Pitrou <solipsis@pitrou.net> parents: 63764 diff changeset	2043 frombytes_doc},
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2044 {"fromunicode", (PyCFunction)array_fromunicode, METH_VARARGS,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2045 fromunicode_doc},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2046 {"index", (PyCFunction)array_index, METH_O,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2047 index_doc},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2048 {"insert", (PyCFunction)array_insert, METH_VARARGS,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2049 insert_doc},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2050 {"pop", (PyCFunction)array_pop, METH_VARARGS,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2051 pop_doc},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2052 {"__reduce_ex__", (PyCFunction)array_reduce_ex, METH_O,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2053 reduce_doc},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2054 {"remove", (PyCFunction)array_remove, METH_O,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2055 remove_doc},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2056 {"reverse", (PyCFunction)array_reverse, METH_NOARGS,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2057 reverse_doc},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2058 /* {"sort", (PyCFunction)array_sort, METH_VARARGS,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2059 sort_doc},*/
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2060 {"tofile", (PyCFunction)array_tofile, METH_O,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2061 tofile_doc},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2062 {"tolist", (PyCFunction)array_tolist, METH_NOARGS,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2063 tolist_doc},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2064 {"tostring", (PyCFunction)array_tostring, METH_NOARGS,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2065 tostring_doc},
64355 fa8b57f987c5 Issue #8990: array.fromstring() and array.tostring() get renamed to Antoine Pitrou <solipsis@pitrou.net> parents: 63764 diff changeset	2066 {"tobytes", (PyCFunction)array_tobytes, METH_NOARGS,
fa8b57f987c5 Issue #8990: array.fromstring() and array.tostring() get renamed to Antoine Pitrou <solipsis@pitrou.net> parents: 63764 diff changeset	2067 tobytes_doc},
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2068 {"tounicode", (PyCFunction)array_tounicode, METH_NOARGS,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2069 tounicode_doc},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2070 {NULL, NULL} /* sentinel */
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	2071 };
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	2072
4628 7df5d4cf8277 Renamed Grandly (I think). Roger E. Masse <rmasse@newcnri.cnri.reston.va.us> parents: 4600 diff changeset	2073 static PyObject *
13590 c503d8e474b3 ANSI-fication (got lost in the deep seas of source forge <wink>) Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13447 diff changeset	2074 array_repr(arrayobject *a)
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	2075 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2076 char typecode;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2077 PyObject s, v = NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2078 Py_ssize_t len;
22098 966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	2079
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2080 len = Py_SIZE(a);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2081 typecode = a->ob_descr->typecode;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2082 if (len == 0) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2083 return PyUnicode_FromFormat("array('%c')", typecode);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2084 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2085 if ((typecode == 'u'))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2086 v = array_tounicode(a, NULL);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2087 else
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2088 v = array_tolist(a, NULL);
28742 bd678e65f784 SF Patch 685051: fix for 680789: reprs in arraymodule Raymond Hettinger <python@rcn.com> parents: 28320 diff changeset	2089
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2090 s = PyUnicode_FromFormat("array('%c', %R)", typecode, v);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2091 Py_DECREF(v);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2092 return s;
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	2093 }
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	2094
23929 26ba17b758b9 Fix the bug described in Michael W. Hudson <mwh@python.net> parents: 23832 diff changeset	2095 static PyObject*
26ba17b758b9 Fix the bug described in Michael W. Hudson <mwh@python.net> parents: 23832 diff changeset	2096 array_subscr(arrayobject* self, PyObject* item)
26ba17b758b9 Fix the bug described in Michael W. Hudson <mwh@python.net> parents: 23832 diff changeset	2097 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2098 if (PyIndex_Check(item)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2099 Py_ssize_t i = PyNumber_AsSsize_t(item, PyExc_IndexError);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2100 if (i==-1 && PyErr_Occurred()) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2101 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2102 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2103 if (i < 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2104 i += Py_SIZE(self);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2105 return array_item(self, i);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2106 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2107 else if (PySlice_Check(item)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2108 Py_ssize_t start, stop, step, slicelength, cur, i;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2109 PyObject* result;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2110 arrayobject* ar;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2111 int itemsize = self->ob_descr->itemsize;
23929 26ba17b758b9 Fix the bug described in Michael W. Hudson <mwh@python.net> parents: 23832 diff changeset	2112
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2113 if (PySlice_GetIndicesEx((PySliceObject*)item, Py_SIZE(self),
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2114 &start, &stop, &step, &slicelength) < 0) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2115 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2116 }
23929 26ba17b758b9 Fix the bug described in Michael W. Hudson <mwh@python.net> parents: 23832 diff changeset	2117
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2118 if (slicelength <= 0) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2119 return newarrayobject(&Arraytype, 0, self->ob_descr);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2120 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2121 else if (step == 1) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2122 PyObject *result = newarrayobject(&Arraytype,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2123 slicelength, self->ob_descr);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2124 if (result == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2125 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2126 memcpy(((arrayobject *)result)->ob_item,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2127 self->ob_item + start * itemsize,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2128 slicelength * itemsize);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2129 return result;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2130 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2131 else {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2132 result = newarrayobject(&Arraytype, slicelength, self->ob_descr);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2133 if (!result) return NULL;
23929 26ba17b758b9 Fix the bug described in Michael W. Hudson <mwh@python.net> parents: 23832 diff changeset	2134
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2135 ar = (arrayobject*)result;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2136
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2137 for (cur = start, i = 0; i < slicelength;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2138 cur += step, i++) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2139 memcpy(ar->ob_item + i*itemsize,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2140 self->ob_item + cur*itemsize,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2141 itemsize);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2142 }
23929 26ba17b758b9 Fix the bug described in Michael W. Hudson <mwh@python.net> parents: 23832 diff changeset	2143
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2144 return result;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2145 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2146 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2147 else {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2148 PyErr_SetString(PyExc_TypeError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2149 "array indices must be integers");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2150 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2151 }
23929 26ba17b758b9 Fix the bug described in Michael W. Hudson <mwh@python.net> parents: 23832 diff changeset	2152 }
26ba17b758b9 Fix the bug described in Michael W. Hudson <mwh@python.net> parents: 23832 diff changeset	2153
26ba17b758b9 Fix the bug described in Michael W. Hudson <mwh@python.net> parents: 23832 diff changeset	2154 static int
26ba17b758b9 Fix the bug described in Michael W. Hudson <mwh@python.net> parents: 23832 diff changeset	2155 array_ass_subscr(arrayobject* self, PyObject* item, PyObject* value)
26ba17b758b9 Fix the bug described in Michael W. Hudson <mwh@python.net> parents: 23832 diff changeset	2156 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2157 Py_ssize_t start, stop, step, slicelength, needed;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2158 arrayobject* other;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2159 int itemsize;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2160
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2161 if (PyIndex_Check(item)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2162 Py_ssize_t i = PyNumber_AsSsize_t(item, PyExc_IndexError);
42954 27f0289b6835 Merge the trunk changes in. Breaks socket.ssl for now. Thomas Wouters <thomas@python.org> parents: 42856 diff changeset	2163
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2164 if (i == -1 && PyErr_Occurred())
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2165 return -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2166 if (i < 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2167 i += Py_SIZE(self);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2168 if (i < 0 \|\| i >= Py_SIZE(self)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2169 PyErr_SetString(PyExc_IndexError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2170 "array assignment index out of range");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2171 return -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2172 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2173 if (value == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2174 /* Fall through to slice assignment */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2175 start = i;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2176 stop = i + 1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2177 step = 1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2178 slicelength = 1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2179 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2180 else
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2181 return (*self->ob_descr->setitem)(self, i, value);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2182 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2183 else if (PySlice_Check(item)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2184 if (PySlice_GetIndicesEx((PySliceObject *)item,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2185 Py_SIZE(self), &start, &stop,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2186 &step, &slicelength) < 0) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2187 return -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2188 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2189 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2190 else {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2191 PyErr_SetString(PyExc_TypeError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2192 "array indices must be integer");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2193 return -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2194 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2195 if (value == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2196 other = NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2197 needed = 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2198 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2199 else if (array_Check(value)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2200 other = (arrayobject *)value;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2201 needed = Py_SIZE(other);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2202 if (self == other) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2203 /* Special case "self[i:j] = self" -- copy self first */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2204 int ret;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2205 value = array_slice(other, 0, needed);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2206 if (value == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2207 return -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2208 ret = array_ass_subscr(self, item, value);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2209 Py_DECREF(value);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2210 return ret;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2211 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2212 if (other->ob_descr != self->ob_descr) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2213 PyErr_BadArgument();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2214 return -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2215 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2216 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2217 else {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2218 PyErr_Format(PyExc_TypeError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2219 "can only assign array (not \"%.200s\") to array slice",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2220 Py_TYPE(value)->tp_name);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2221 return -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2222 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2223 itemsize = self->ob_descr->itemsize;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2224 /* for 'a[2:1] = ...', the insertion point is 'start', not 'stop' */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2225 if ((step > 0 && stop < start) \|\|
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2226 (step < 0 && stop > start))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2227 stop = start;
55124 7bb7758e6d64 Add the fix for issue 4509 to the mapping methods. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55115 diff changeset	2228
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2229 /* Issue #4509: If the array has exported buffers and the slice
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2230 assignment would change the size of the array, fail early to make
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2231 sure we don't modify it. */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2232 if ((needed == 0 \|\| slicelength != needed) && self->ob_exports > 0) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2233 PyErr_SetString(PyExc_BufferError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2234 "cannot resize an array that is exporting buffers");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2235 return -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2236 }
55124 7bb7758e6d64 Add the fix for issue 4509 to the mapping methods. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55115 diff changeset	2237
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2238 if (step == 1) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2239 if (slicelength > needed) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2240 memmove(self->ob_item + (start + needed) * itemsize,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2241 self->ob_item + stop * itemsize,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2242 (Py_SIZE(self) - stop) * itemsize);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2243 if (array_resize(self, Py_SIZE(self) +
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2244 needed - slicelength) < 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2245 return -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2246 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2247 else if (slicelength < needed) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2248 if (array_resize(self, Py_SIZE(self) +
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2249 needed - slicelength) < 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2250 return -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2251 memmove(self->ob_item + (start + needed) * itemsize,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2252 self->ob_item + stop * itemsize,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2253 (Py_SIZE(self) - start - needed) * itemsize);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2254 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2255 if (needed > 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2256 memcpy(self->ob_item + start * itemsize,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2257 other->ob_item, needed * itemsize);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2258 return 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2259 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2260 else if (needed == 0) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2261 /* Delete slice */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2262 size_t cur;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2263 Py_ssize_t i;
58563 2b08de9a1fa0 Merged revisions 77821 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 56745 diff changeset	2264
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2265 if (step < 0) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2266 stop = start + 1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2267 start = stop + step * (slicelength - 1) - 1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2268 step = -step;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2269 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2270 for (cur = start, i = 0; i < slicelength;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2271 cur += step, i++) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2272 Py_ssize_t lim = step - 1;
23929 26ba17b758b9 Fix the bug described in Michael W. Hudson <mwh@python.net> parents: 23832 diff changeset	2273
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2274 if (cur + step >= (size_t)Py_SIZE(self))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2275 lim = Py_SIZE(self) - cur - 1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2276 memmove(self->ob_item + (cur - i) * itemsize,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2277 self->ob_item + (cur + 1) * itemsize,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2278 lim * itemsize);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2279 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2280 cur = start + slicelength * step;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2281 if (cur < (size_t)Py_SIZE(self)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2282 memmove(self->ob_item + (cur-slicelength) * itemsize,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2283 self->ob_item + cur * itemsize,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2284 (Py_SIZE(self) - cur) * itemsize);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2285 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2286 if (array_resize(self, Py_SIZE(self) - slicelength) < 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2287 return -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2288 return 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2289 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2290 else {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2291 Py_ssize_t cur, i;
23929 26ba17b758b9 Fix the bug described in Michael W. Hudson <mwh@python.net> parents: 23832 diff changeset	2292
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2293 if (needed != slicelength) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2294 PyErr_Format(PyExc_ValueError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2295 "attempt to assign array of size %zd "
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2296 "to extended slice of size %zd",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2297 needed, slicelength);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2298 return -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2299 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2300 for (cur = start, i = 0; i < slicelength;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2301 cur += step, i++) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2302 memcpy(self->ob_item + cur * itemsize,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2303 other->ob_item + i * itemsize,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2304 itemsize);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2305 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2306 return 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2307 }
23929 26ba17b758b9 Fix the bug described in Michael W. Hudson <mwh@python.net> parents: 23832 diff changeset	2308 }
26ba17b758b9 Fix the bug described in Michael W. Hudson <mwh@python.net> parents: 23832 diff changeset	2309
26ba17b758b9 Fix the bug described in Michael W. Hudson <mwh@python.net> parents: 23832 diff changeset	2310 static PyMappingMethods array_as_mapping = {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2311 (lenfunc)array_length,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2312 (binaryfunc)array_subscr,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2313 (objobjargproc)array_ass_subscr
23929 26ba17b758b9 Fix the bug described in Michael W. Hudson <mwh@python.net> parents: 23832 diff changeset	2314 };
26ba17b758b9 Fix the bug described in Michael W. Hudson <mwh@python.net> parents: 23832 diff changeset	2315
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41434 diff changeset	2316 static const void *emptybuf = "";
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41434 diff changeset	2317
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: 42540 diff changeset	2318
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: 42540 diff changeset	2319 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: 43100 diff changeset	2320 array_buffer_getbuf(arrayobject self, Py_buffer view, int flags)
5410 3b2fda31bf1b Checkin of Jack's buffer mods. Guido van Rossum <guido@python.org> parents: 5318 diff changeset	2321 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2322 if (view==NULL) goto finish;
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: 42540 diff changeset	2323
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2324 view->buf = (void *)self->ob_item;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2325 view->obj = (PyObject*)self;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2326 Py_INCREF(self);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2327 if (view->buf == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2328 view->buf = (void *)emptybuf;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2329 view->len = (Py_SIZE(self)) * self->ob_descr->itemsize;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2330 view->readonly = 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2331 view->ndim = 1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2332 view->itemsize = self->ob_descr->itemsize;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2333 view->suboffsets = NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2334 view->shape = NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2335 if ((flags & PyBUF_ND)==PyBUF_ND) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2336 view->shape = &((Py_SIZE(self)));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2337 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2338 view->strides = NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2339 if ((flags & PyBUF_STRIDES)==PyBUF_STRIDES)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2340 view->strides = &(view->itemsize);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2341 view->format = NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2342 view->internal = NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2343 if ((flags & PyBUF_FORMAT) == PyBUF_FORMAT) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2344 view->format = self->ob_descr->formats;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2345 #ifdef Py_UNICODE_WIDE
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2346 if (self->ob_descr->typecode == 'u') {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2347 view->format = "w";
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: 42540 diff changeset	2348 }
43555 8e72dacf7f3a Eliminate use of PyBUF_CHARACTER flag which is no longer part of the buffer interface. Fix up array module to export the correct format for wide-builds. Travis E. Oliphant <oliphant@enthought.com> parents: 43554 diff changeset	2349 #endif
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2350 }
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: 42540 diff changeset	2351
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: 42540 diff changeset	2352 finish:
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2353 self->ob_exports++;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2354 return 0;
5410 3b2fda31bf1b Checkin of Jack's buffer mods. Guido van Rossum <guido@python.org> parents: 5318 diff changeset	2355 }
3b2fda31bf1b Checkin of Jack's buffer mods. Guido van Rossum <guido@python.org> parents: 5318 diff changeset	2356
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: 42540 diff changeset	2357 static 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: 43100 diff changeset	2358 array_buffer_relbuf(arrayobject self, Py_buffer view)
5410 3b2fda31bf1b Checkin of Jack's buffer mods. Guido van Rossum <guido@python.org> parents: 5318 diff changeset	2359 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2360 self->ob_exports--;
5410 3b2fda31bf1b Checkin of Jack's buffer mods. Guido van Rossum <guido@python.org> parents: 5318 diff changeset	2361 }
3b2fda31bf1b Checkin of Jack's buffer mods. Guido van Rossum <guido@python.org> parents: 5318 diff changeset	2362
4628 7df5d4cf8277 Renamed Grandly (I think). Roger E. Masse <rmasse@newcnri.cnri.reston.va.us> parents: 4600 diff changeset	2363 static PySequenceMethods array_as_sequence = {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2364 (lenfunc)array_length, /sq_length/
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2365 (binaryfunc)array_concat, /sq_concat/
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2366 (ssizeargfunc)array_repeat, /sq_repeat/
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2367 (ssizeargfunc)array_item, /sq_item/
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2368 0, /sq_slice/
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2369 (ssizeobjargproc)array_ass_item, /sq_ass_item/
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2370 0, /sq_ass_slice/
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2371 (objobjproc)array_contains, /sq_contains/
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2372 (binaryfunc)array_inplace_concat, /sq_inplace_concat/
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2373 (ssizeargfunc)array_inplace_repeat /sq_inplace_repeat/
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	2374 };
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	2375
5410 3b2fda31bf1b Checkin of Jack's buffer mods. Guido van Rossum <guido@python.org> parents: 5318 diff changeset	2376 static PyBufferProcs array_as_buffer = {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2377 (getbufferproc)array_buffer_getbuf,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2378 (releasebufferproc)array_buffer_relbuf
5410 3b2fda31bf1b Checkin of Jack's buffer mods. Guido van Rossum <guido@python.org> parents: 5318 diff changeset	2379 };
3b2fda31bf1b Checkin of Jack's buffer mods. Guido van Rossum <guido@python.org> parents: 5318 diff changeset	2380
4628 7df5d4cf8277 Renamed Grandly (I think). Roger E. Masse <rmasse@newcnri.cnri.reston.va.us> parents: 4600 diff changeset	2381 static PyObject *
22098 966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	2382 array_new(PyTypeObject type, PyObject args, PyObject *kwds)
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	2383 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2384 int c;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2385 PyObject initial = NULL, it = NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2386 struct arraydescr *descr;
22098 966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	2387
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2388 if (type == &Arraytype && !_PyArg_NoKeywords("array.array()", kwds))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2389 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2390
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2391 if (!PyArg_ParseTuple(args, "C\|O:array", &c, &initial))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2392 return NULL;
22098 966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	2393
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2394 if (!(initial == NULL \|\| PyList_Check(initial)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2395 \|\| PyByteArray_Check(initial)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2396 \|\| PyBytes_Check(initial)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2397 \|\| PyTuple_Check(initial)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2398 \|\| ((c=='u') && PyUnicode_Check(initial)))) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2399 it = PyObject_GetIter(initial);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2400 if (it == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2401 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2402 /* We set initial to NULL so that the subsequent code
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2403 will create an empty array of the appropriate type
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2404 and afterwards we can use array_iter_extend to populate
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2405 the array.
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2406 */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2407 initial = NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2408 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2409 for (descr = descriptors; descr->typecode != '\0'; descr++) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2410 if (descr->typecode == c) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2411 PyObject *a;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2412 Py_ssize_t len;
28760 22d177682ae1 SF 686323: Minor array module enhancements Raymond Hettinger <python@rcn.com> parents: 28742 diff changeset	2413
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2414 if (initial == NULL \|\| !(PyList_Check(initial)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2415 \|\| PyTuple_Check(initial)))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2416 len = 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2417 else
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2418 len = PySequence_Size(initial);
22098 966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	2419
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2420 a = newarrayobject(type, len, descr);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2421 if (a == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2422 return NULL;
22098 966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	2423
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2424 if (len > 0) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2425 Py_ssize_t i;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2426 for (i = 0; i < len; i++) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2427 PyObject *v =
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2428 PySequence_GetItem(initial, i);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2429 if (v == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2430 Py_DECREF(a);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2431 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2432 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2433 if (setarrayitem(a, i, v) != 0) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2434 Py_DECREF(v);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2435 Py_DECREF(a);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2436 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2437 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2438 Py_DECREF(v);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2439 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2440 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2441 else if (initial != NULL && (PyByteArray_Check(initial) \|\|
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2442 PyBytes_Check(initial))) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2443 PyObject t_initial, v;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2444 t_initial = PyTuple_Pack(1, initial);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2445 if (t_initial == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2446 Py_DECREF(a);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2447 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2448 }
64355 fa8b57f987c5 Issue #8990: array.fromstring() and array.tostring() get renamed to Antoine Pitrou <solipsis@pitrou.net> parents: 63764 diff changeset	2449 v = array_frombytes((arrayobject *)a,
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2450 t_initial);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2451 Py_DECREF(t_initial);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2452 if (v == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2453 Py_DECREF(a);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2454 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2455 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2456 Py_DECREF(v);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2457 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2458 else if (initial != NULL && PyUnicode_Check(initial)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2459 Py_ssize_t n = PyUnicode_GET_DATA_SIZE(initial);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2460 if (n > 0) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2461 arrayobject self = (arrayobject )a;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2462 char *item = self->ob_item;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2463 item = (char *)PyMem_Realloc(item, n);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2464 if (item == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2465 PyErr_NoMemory();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2466 Py_DECREF(a);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2467 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2468 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2469 self->ob_item = item;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2470 Py_SIZE(self) = n / sizeof(Py_UNICODE);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2471 memcpy(item, PyUnicode_AS_DATA(initial), n);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2472 self->allocated = Py_SIZE(self);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2473 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2474 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2475 if (it != NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2476 if (array_iter_extend((arrayobject *)a, it) == -1) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2477 Py_DECREF(it);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2478 Py_DECREF(a);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2479 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2480 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2481 Py_DECREF(it);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2482 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2483 return a;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2484 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2485 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2486 PyErr_SetString(PyExc_ValueError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2487 "bad typecode (must be b, B, u, h, H, i, I, l, L, f or d)");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2488 return NULL;
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	2489 }
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	2490
87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	2491
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23433 diff changeset	2492 PyDoc_STRVAR(module_doc,
22098 966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	2493 "This module defines an object type which can efficiently represent\n\
9343 4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	2494 an array of basic values: characters, integers, floating point\n\
4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	2495 numbers. Arrays are sequence types and behave very much like lists,\n\
4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	2496 except that the type of objects stored in them is constrained. The\n\
4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	2497 type is specified at object creation time by using a type code, which\n\
4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	2498 is a single character. The following type codes are defined:\n\
4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	2499 \n\
4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	2500 Type code C Type Minimum size in bytes \n\
4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	2501 'b' signed integer 1 \n\
4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	2502 'B' unsigned integer 1 \n\
43548 fb9d5306f4c7 Fix Issue 1268 with the array module by backing-out the 'w' addition. All builds will continue to use 'u' for unicode. Travis E. Oliphant <oliphant@enthought.com> parents: 43423 diff changeset	2503 'u' Unicode character 2 (see note) \n\
9343 4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	2504 'h' signed integer 2 \n\
4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	2505 'H' unsigned integer 2 \n\
4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	2506 'i' signed integer 2 \n\
4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	2507 'I' unsigned integer 2 \n\
4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	2508 'l' signed integer 4 \n\
4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	2509 'L' unsigned integer 4 \n\
4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	2510 'f' floating point 4 \n\
4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	2511 'd' floating point 8 \n\
4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	2512 \n\
43548 fb9d5306f4c7 Fix Issue 1268 with the array module by backing-out the 'w' addition. All builds will continue to use 'u' for unicode. Travis E. Oliphant <oliphant@enthought.com> parents: 43423 diff changeset	2513 NOTE: The 'u' typecode corresponds to Python's unicode character. On \n\
fb9d5306f4c7 Fix Issue 1268 with the array module by backing-out the 'w' addition. All builds will continue to use 'u' for unicode. Travis E. Oliphant <oliphant@enthought.com> parents: 43423 diff changeset	2514 narrow builds this is 2-bytes on wide builds this is 4-bytes.\n\
fb9d5306f4c7 Fix Issue 1268 with the array module by backing-out the 'w' addition. All builds will continue to use 'u' for unicode. Travis E. Oliphant <oliphant@enthought.com> parents: 43423 diff changeset	2515 \n\
22098 966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	2516 The constructor is:\n\
9343 4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	2517 \n\
4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	2518 array(typecode [, initializer]) -- create a new array\n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23433 diff changeset	2519 ");
9343 4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	2520
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23433 diff changeset	2521 PyDoc_STRVAR(arraytype_doc,
22098 966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	2522 "array(typecode [, initializer]) -> array\n\
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	2523 \n\
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	2524 Return a new array whose items are restricted by typecode, and\n\
33316 0b181bf230c9 SF feature request #992967: array.array objects should support sequences. Raymond Hettinger <python@rcn.com> parents: 32159 diff changeset	2525 initialized from the optional initializer value, which must be a list,\n\
0b181bf230c9 SF feature request #992967: array.array objects should support sequences. Raymond Hettinger <python@rcn.com> parents: 32159 diff changeset	2526 string. or iterable over elements of the appropriate type.\n\
22098 966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	2527 \n\
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	2528 Arrays represent basic values and behave very much like lists, except\n\
9343 4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	2529 the type of objects stored in them is constrained.\n\
4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	2530 \n\
4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	2531 Methods:\n\
4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	2532 \n\
4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	2533 append() -- append a new item to the end of the array\n\
4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	2534 buffer_info() -- return information giving the current memory info\n\
4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	2535 byteswap() -- byteswap all the items of the array\n\
51776 d06a3ebf306f Merged revisions 69846 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 51271 diff changeset	2536 count() -- return number of occurrences of an object\n\
31660 35f56e08727f SF feature request #686323: Minor array module enhancements Raymond Hettinger <python@rcn.com> parents: 31659 diff changeset	2537 extend() -- extend array by appending multiple elements from an iterable\n\
9343 4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	2538 fromfile() -- read items from a file object\n\
4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	2539 fromlist() -- append items from the list\n\
4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	2540 fromstring() -- append items from the string\n\
51776 d06a3ebf306f Merged revisions 69846 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 51271 diff changeset	2541 index() -- return index of first occurrence of an object\n\
9343 4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	2542 insert() -- insert a new item into the array at a provided position\n\
13772 eea51275acbf added count, extend, index, pop and remove to arraymodule Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13651 diff changeset	2543 pop() -- remove and return item (default last)\n\
51776 d06a3ebf306f Merged revisions 69846 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 51271 diff changeset	2544 remove() -- remove first occurrence of an object\n\
9343 4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	2545 reverse() -- reverse the order of the items in the array\n\
4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	2546 tofile() -- write all items to a file object\n\
4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	2547 tolist() -- return the array converted to an ordinary list\n\
4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	2548 tostring() -- return the array converted to a string\n\
4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	2549 \n\
22098 966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	2550 Attributes:\n\
9343 4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	2551 \n\
4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	2552 typecode -- the typecode character used to create the array\n\
4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	2553 itemsize -- the length in bytes of one array item\n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23433 diff changeset	2554 ");
9343 4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	2555
27128 047b6e16ab2e SF patch #662433: Fill arraymodule's tp_iter and sq_contains slots Raymond Hettinger <python@rcn.com> parents: 27104 diff changeset	2556 static PyObject array_iter(arrayobject ao);
047b6e16ab2e SF patch #662433: Fill arraymodule's tp_iter and sq_contains slots Raymond Hettinger <python@rcn.com> parents: 27104 diff changeset	2557
24283 c0a67a1cab09 Removed more stray instances of statichere, but left _sre.c alone. Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	2558 static PyTypeObject Arraytype = {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2559 PyVarObject_HEAD_INIT(NULL, 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2560 "array.array",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2561 sizeof(arrayobject),
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2562 0,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2563 (destructor)array_dealloc, /* tp_dealloc */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2564 0, /* tp_print */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2565 0, /* tp_getattr */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2566 0, /* tp_setattr */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2567 0, /* tp_reserved */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2568 (reprfunc)array_repr, /* tp_repr */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2569 0, /* tp_as_number*/
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2570 &array_as_sequence, /* tp_as_sequence*/
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2571 &array_as_mapping, /* tp_as_mapping*/
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2572 0, /* tp_hash */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2573 0, /* tp_call */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2574 0, /* tp_str */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2575 PyObject_GenericGetAttr, /* tp_getattro */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2576 0, /* tp_setattro */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2577 &array_as_buffer, /* tp_as_buffer*/
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2578 Py_TPFLAGS_DEFAULT \| Py_TPFLAGS_BASETYPE, /* tp_flags */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2579 arraytype_doc, /* tp_doc */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2580 0, /* tp_traverse */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2581 0, /* tp_clear */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2582 array_richcompare, /* tp_richcompare */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2583 offsetof(arrayobject, weakreflist), /* tp_weaklistoffset */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2584 (getiterfunc)array_iter, /* tp_iter */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2585 0, /* tp_iternext */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2586 array_methods, /* tp_methods */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2587 0, /* tp_members */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2588 array_getsets, /* tp_getset */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2589 0, /* tp_base */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2590 0, /* tp_dict */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2591 0, /* tp_descr_get */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2592 0, /* tp_descr_set */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2593 0, /* tp_dictoffset */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2594 0, /* tp_init */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2595 PyType_GenericAlloc, /* tp_alloc */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2596 array_new, /* tp_new */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2597 PyObject_Del, /* tp_free */
9343 4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	2598 };
4f78504a5f81 Doc strings by Chris Petrilli. Guido van Rossum <guido@python.org> parents: 5982 diff changeset	2599
27128 047b6e16ab2e SF patch #662433: Fill arraymodule's tp_iter and sq_contains slots Raymond Hettinger <python@rcn.com> parents: 27104 diff changeset	2600
047b6e16ab2e SF patch #662433: Fill arraymodule's tp_iter and sq_contains slots Raymond Hettinger <python@rcn.com> parents: 27104 diff changeset	2601 /********************* Array Iterator ************************/
047b6e16ab2e SF patch #662433: Fill arraymodule's tp_iter and sq_contains slots Raymond Hettinger <python@rcn.com> parents: 27104 diff changeset	2602
047b6e16ab2e SF patch #662433: Fill arraymodule's tp_iter and sq_contains slots Raymond Hettinger <python@rcn.com> parents: 27104 diff changeset	2603 typedef struct {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2604 PyObject_HEAD
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2605 Py_ssize_t index;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2606 arrayobject *ao;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2607 PyObject * (getitem)(struct arrayobject , Py_ssize_t);
27128 047b6e16ab2e SF patch #662433: Fill arraymodule's tp_iter and sq_contains slots Raymond Hettinger <python@rcn.com> parents: 27104 diff changeset	2608 } arrayiterobject;
047b6e16ab2e SF patch #662433: Fill arraymodule's tp_iter and sq_contains slots Raymond Hettinger <python@rcn.com> parents: 27104 diff changeset	2609
047b6e16ab2e SF patch #662433: Fill arraymodule's tp_iter and sq_contains slots Raymond Hettinger <python@rcn.com> parents: 27104 diff changeset	2610 static PyTypeObject PyArrayIter_Type;
047b6e16ab2e SF patch #662433: Fill arraymodule's tp_iter and sq_contains slots Raymond Hettinger <python@rcn.com> parents: 27104 diff changeset	2611
047b6e16ab2e SF patch #662433: Fill arraymodule's tp_iter and sq_contains slots Raymond Hettinger <python@rcn.com> parents: 27104 diff changeset	2612 #define PyArrayIter_Check(op) PyObject_TypeCheck(op, &PyArrayIter_Type)
047b6e16ab2e SF patch #662433: Fill arraymodule's tp_iter and sq_contains slots Raymond Hettinger <python@rcn.com> parents: 27104 diff changeset	2613
047b6e16ab2e SF patch #662433: Fill arraymodule's tp_iter and sq_contains slots Raymond Hettinger <python@rcn.com> parents: 27104 diff changeset	2614 static PyObject *
047b6e16ab2e SF patch #662433: Fill arraymodule's tp_iter and sq_contains slots Raymond Hettinger <python@rcn.com> parents: 27104 diff changeset	2615 array_iter(arrayobject *ao)
047b6e16ab2e SF patch #662433: Fill arraymodule's tp_iter and sq_contains slots Raymond Hettinger <python@rcn.com> parents: 27104 diff changeset	2616 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2617 arrayiterobject *it;
27128 047b6e16ab2e SF patch #662433: Fill arraymodule's tp_iter and sq_contains slots Raymond Hettinger <python@rcn.com> parents: 27104 diff changeset	2618
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2619 if (!array_Check(ao)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2620 PyErr_BadInternalCall();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2621 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2622 }
27128 047b6e16ab2e SF patch #662433: Fill arraymodule's tp_iter and sq_contains slots Raymond Hettinger <python@rcn.com> parents: 27104 diff changeset	2623
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2624 it = PyObject_GC_New(arrayiterobject, &PyArrayIter_Type);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2625 if (it == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2626 return NULL;
27128 047b6e16ab2e SF patch #662433: Fill arraymodule's tp_iter and sq_contains slots Raymond Hettinger <python@rcn.com> parents: 27104 diff changeset	2627
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2628 Py_INCREF(ao);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2629 it->ao = ao;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2630 it->index = 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2631 it->getitem = ao->ob_descr->getitem;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2632 PyObject_GC_Track(it);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2633 return (PyObject *)it;
27128 047b6e16ab2e SF patch #662433: Fill arraymodule's tp_iter and sq_contains slots Raymond Hettinger <python@rcn.com> parents: 27104 diff changeset	2634 }
047b6e16ab2e SF patch #662433: Fill arraymodule's tp_iter and sq_contains slots Raymond Hettinger <python@rcn.com> parents: 27104 diff changeset	2635
047b6e16ab2e SF patch #662433: Fill arraymodule's tp_iter and sq_contains slots Raymond Hettinger <python@rcn.com> parents: 27104 diff changeset	2636 static PyObject *
047b6e16ab2e SF patch #662433: Fill arraymodule's tp_iter and sq_contains slots Raymond Hettinger <python@rcn.com> parents: 27104 diff changeset	2637 arrayiter_next(arrayiterobject *it)
047b6e16ab2e SF patch #662433: Fill arraymodule's tp_iter and sq_contains slots Raymond Hettinger <python@rcn.com> parents: 27104 diff changeset	2638 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2639 assert(PyArrayIter_Check(it));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2640 if (it->index < Py_SIZE(it->ao))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2641 return (*it->getitem)(it->ao, it->index++);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2642 return NULL;
27128 047b6e16ab2e SF patch #662433: Fill arraymodule's tp_iter and sq_contains slots Raymond Hettinger <python@rcn.com> parents: 27104 diff changeset	2643 }
047b6e16ab2e SF patch #662433: Fill arraymodule's tp_iter and sq_contains slots Raymond Hettinger <python@rcn.com> parents: 27104 diff changeset	2644
047b6e16ab2e SF patch #662433: Fill arraymodule's tp_iter and sq_contains slots Raymond Hettinger <python@rcn.com> parents: 27104 diff changeset	2645 static void
047b6e16ab2e SF patch #662433: Fill arraymodule's tp_iter and sq_contains slots Raymond Hettinger <python@rcn.com> parents: 27104 diff changeset	2646 arrayiter_dealloc(arrayiterobject *it)
047b6e16ab2e SF patch #662433: Fill arraymodule's tp_iter and sq_contains slots Raymond Hettinger <python@rcn.com> parents: 27104 diff changeset	2647 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2648 PyObject_GC_UnTrack(it);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2649 Py_XDECREF(it->ao);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2650 PyObject_GC_Del(it);
27128 047b6e16ab2e SF patch #662433: Fill arraymodule's tp_iter and sq_contains slots Raymond Hettinger <python@rcn.com> parents: 27104 diff changeset	2651 }
047b6e16ab2e SF patch #662433: Fill arraymodule's tp_iter and sq_contains slots Raymond Hettinger <python@rcn.com> parents: 27104 diff changeset	2652
047b6e16ab2e SF patch #662433: Fill arraymodule's tp_iter and sq_contains slots Raymond Hettinger <python@rcn.com> parents: 27104 diff changeset	2653 static int
047b6e16ab2e SF patch #662433: Fill arraymodule's tp_iter and sq_contains slots Raymond Hettinger <python@rcn.com> parents: 27104 diff changeset	2654 arrayiter_traverse(arrayiterobject it, visitproc visit, void arg)
047b6e16ab2e SF patch #662433: Fill arraymodule's tp_iter and sq_contains slots Raymond Hettinger <python@rcn.com> parents: 27104 diff changeset	2655 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2656 Py_VISIT(it->ao);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2657 return 0;
27128 047b6e16ab2e SF patch #662433: Fill arraymodule's tp_iter and sq_contains slots Raymond Hettinger <python@rcn.com> parents: 27104 diff changeset	2658 }
047b6e16ab2e SF patch #662433: Fill arraymodule's tp_iter and sq_contains slots Raymond Hettinger <python@rcn.com> parents: 27104 diff changeset	2659
047b6e16ab2e SF patch #662433: Fill arraymodule's tp_iter and sq_contains slots Raymond Hettinger <python@rcn.com> parents: 27104 diff changeset	2660 static PyTypeObject PyArrayIter_Type = {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2661 PyVarObject_HEAD_INIT(NULL, 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2662 "arrayiterator", /* tp_name */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2663 sizeof(arrayiterobject), /* tp_basicsize */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2664 0, /* tp_itemsize */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2665 /* methods */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2666 (destructor)arrayiter_dealloc, /* tp_dealloc */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2667 0, /* tp_print */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2668 0, /* tp_getattr */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2669 0, /* tp_setattr */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2670 0, /* tp_reserved */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2671 0, /* tp_repr */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2672 0, /* tp_as_number */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2673 0, /* tp_as_sequence */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2674 0, /* tp_as_mapping */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2675 0, /* tp_hash */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2676 0, /* tp_call */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2677 0, /* tp_str */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2678 PyObject_GenericGetAttr, /* tp_getattro */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2679 0, /* tp_setattro */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2680 0, /* tp_as_buffer */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2681 Py_TPFLAGS_DEFAULT \| Py_TPFLAGS_HAVE_GC,/* tp_flags */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2682 0, /* tp_doc */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2683 (traverseproc)arrayiter_traverse, /* tp_traverse */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2684 0, /* tp_clear */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2685 0, /* tp_richcompare */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2686 0, /* tp_weaklistoffset */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2687 PyObject_SelfIter, /* tp_iter */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2688 (iternextfunc)arrayiter_next, /* tp_iternext */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2689 0, /* tp_methods */
27128 047b6e16ab2e SF patch #662433: Fill arraymodule's tp_iter and sq_contains slots Raymond Hettinger <python@rcn.com> parents: 27104 diff changeset	2690 };
047b6e16ab2e SF patch #662433: Fill arraymodule's tp_iter and sq_contains slots Raymond Hettinger <python@rcn.com> parents: 27104 diff changeset	2691
047b6e16ab2e SF patch #662433: Fill arraymodule's tp_iter and sq_contains slots Raymond Hettinger <python@rcn.com> parents: 27104 diff changeset	2692
047b6e16ab2e SF patch #662433: Fill arraymodule's tp_iter and sq_contains slots Raymond Hettinger <python@rcn.com> parents: 27104 diff changeset	2693 /********************* Install Module ************************/
047b6e16ab2e SF patch #662433: Fill arraymodule's tp_iter and sq_contains slots Raymond Hettinger <python@rcn.com> parents: 27104 diff changeset	2694
22098 966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	2695 /* No functions in array module. */
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	2696 static PyMethodDef a_methods[] = {
55259 edc714ffe6cc Issue #2389: Implement a portable mechanism for pickling array objects. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55204 diff changeset	2697 {"_array_reconstructor", array_reconstructor, METH_VARARGS,
edc714ffe6cc Issue #2389: Implement a portable mechanism for pickling array objects. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55204 diff changeset	2698 PyDoc_STR("Internal. Used for pickling support.")},
22098 966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	2699 {NULL, NULL, 0, NULL} /* Sentinel */
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	2700 };
966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	2701
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47500 diff changeset	2702 static struct PyModuleDef arraymodule = {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2703 PyModuleDef_HEAD_INIT,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2704 "array",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2705 module_doc,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2706 -1,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2707 a_methods,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2708 NULL,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2709 NULL,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2710 NULL,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2711 NULL
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47500 diff changeset	2712 };
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47500 diff changeset	2713
22098 966725095854 Patch 520694: arraymodule.c improvements: Martin v. Löwis <martin@v.loewis.de> parents: 21313 diff changeset	2714
24471 f66b3a3509c7 Excise DL_EXPORT/DL_IMPORT from Modules/. Required adding a prototype Mark Hammond <mhammond@skippinet.com.au>* parents: 24424 diff changeset	2715 PyMODINIT_FUNC
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47500 diff changeset	2716 PyInit_array(void)
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	2717 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2718 PyObject *m;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2719 PyObject *typecodes;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2720 Py_ssize_t size = 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2721 register Py_UNICODE *p;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2722 struct arraydescr *descr;
11711 6546ea06e157 Patch from Paul Sokolovsky <Paul.Sokolovsky@technologist.com>: Fred Drake <fdrake@acm.org> parents: 11673 diff changeset	2723
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2724 if (PyType_Ready(&Arraytype) < 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2725 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2726 Py_TYPE(&PyArrayIter_Type) = &PyType_Type;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2727 m = PyModule_Create(&arraymodule);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2728 if (m == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2729 return NULL;
22722 ba68dda15df0 Use the PyModule_() API instead of manipulating the module dictionary Fred Drake <fdrake@acm.org>* parents: 22124 diff changeset	2730
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2731 Py_INCREF((PyObject *)&Arraytype);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2732 PyModule_AddObject(m, "ArrayType", (PyObject *)&Arraytype);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2733 Py_INCREF((PyObject *)&Arraytype);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2734 PyModule_AddObject(m, "array", (PyObject *)&Arraytype);
43548 fb9d5306f4c7 Fix Issue 1268 with the array module by backing-out the 'w' addition. All builds will continue to use 'u' for unicode. Travis E. Oliphant <oliphant@enthought.com> parents: 43423 diff changeset	2735
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2736 for (descr=descriptors; descr->typecode != '\0'; descr++) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2737 size++;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2738 }
43548 fb9d5306f4c7 Fix Issue 1268 with the array module by backing-out the 'w' addition. All builds will continue to use 'u' for unicode. Travis E. Oliphant <oliphant@enthought.com> parents: 43423 diff changeset	2739
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2740 typecodes = PyUnicode_FromStringAndSize(NULL, size);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2741 p = PyUnicode_AS_UNICODE(typecodes);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2742 for (descr = descriptors; descr->typecode != '\0'; descr++) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2743 *p++ = (char)descr->typecode;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2744 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2745
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2746 PyModule_AddObject(m, "typecodes", (PyObject *)typecodes);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2747
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2748 if (PyErr_Occurred()) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2749 Py_DECREF(m);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2750 m = NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2751 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58909 diff changeset	2752 return m;
1235 87ed00a62d31 Added new module "array" (for now optional) defining array objects. Guido van Rossum <guido@python.org> parents: diff changeset	2753 }

Mercurial > cpython-lru_cache-weakref

annotate Modules/arraymodule.c @ 65105:8bcbdd6730a7