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

annotate Objects/memoryobject.c @ 58645:cd00a94186c9

Merged revisions 77916 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r77916 | antoine.pitrou | 2010-02-02 23:36:17 +0100 (mar., 02 févr. 2010) | 4 lines Issue #7385: Fix a crash in `MemoryView_FromObject` when `PyObject_GetBuffer` fails. Patch by Florent Xicluna. ........

author	Antoine Pitrou <solipsis@pitrou.net>
date	Tue, 02 Feb 2010 22:47:00 +0000
parents	7b495c8f2a24
children	189fa92d15dc

rev	line source
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: diff changeset	1
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: diff changeset	2 /* Memoryview object implementation */
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: diff changeset	3
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: diff changeset	4 #include "Python.h"
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: diff changeset	5
50083 725192c64c28 Merged revisions 67650 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 49136 diff changeset	6 static Py_ssize_t
725192c64c28 Merged revisions 67650 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 49136 diff changeset	7 get_shape0(Py_buffer *buf)
725192c64c28 Merged revisions 67650 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 49136 diff changeset	8 {
725192c64c28 Merged revisions 67650 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 49136 diff changeset	9 if (buf->shape != NULL)
725192c64c28 Merged revisions 67650 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 49136 diff changeset	10 return buf->shape[0];
50490 26045ed0c26e Merged revisions 68200 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50083 diff changeset	11 if (buf->ndim == 0)
26045ed0c26e Merged revisions 68200 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50083 diff changeset	12 return 1;
26045ed0c26e Merged revisions 68200 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50083 diff changeset	13 PyErr_SetString(PyExc_TypeError,
26045ed0c26e Merged revisions 68200 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50083 diff changeset	14 "exported buffer does not have any shape information associated "
26045ed0c26e Merged revisions 68200 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50083 diff changeset	15 "to it");
26045ed0c26e Merged revisions 68200 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50083 diff changeset	16 return -1;
26045ed0c26e Merged revisions 68200 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50083 diff changeset	17 }
26045ed0c26e Merged revisions 68200 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50083 diff changeset	18
26045ed0c26e Merged revisions 68200 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50083 diff changeset	19 static void
26045ed0c26e Merged revisions 68200 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50083 diff changeset	20 dup_buffer(Py_buffer dest, Py_buffer src)
26045ed0c26e Merged revisions 68200 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50083 diff changeset	21 {
26045ed0c26e Merged revisions 68200 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50083 diff changeset	22 dest = src;
26045ed0c26e Merged revisions 68200 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50083 diff changeset	23 if (src->ndim == 1 && src->shape != NULL) {
26045ed0c26e Merged revisions 68200 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50083 diff changeset	24 dest->shape = &(dest->smalltable[0]);
26045ed0c26e Merged revisions 68200 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50083 diff changeset	25 dest->shape[0] = get_shape0(src);
26045ed0c26e Merged revisions 68200 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50083 diff changeset	26 }
26045ed0c26e Merged revisions 68200 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50083 diff changeset	27 if (src->ndim == 1 && src->strides != NULL) {
26045ed0c26e Merged revisions 68200 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50083 diff changeset	28 dest->strides = &(dest->smalltable[1]);
26045ed0c26e Merged revisions 68200 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50083 diff changeset	29 dest->strides[0] = src->strides[0];
26045ed0c26e Merged revisions 68200 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50083 diff changeset	30 }
50083 725192c64c28 Merged revisions 67650 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 49136 diff changeset	31 }
725192c64c28 Merged revisions 67650 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 49136 diff changeset	32
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: diff changeset	33 static int
43423 0476a2cc5658 Change PyBuffer to Py_buffer to be consistent with other non-object structures like Py_complex. Add some more functionality to the memoryview object. Travis E. Oliphant <oliphant@enthought.com> parents: 43384 diff changeset	34 memory_getbuf(PyMemoryViewObject self, Py_buffer view, int flags)
42665 85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: diff changeset	35 {
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	36 int res = 0;
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	37 /* XXX for whatever reason fixing the flags seems necessary */
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	38 if (self->view.readonly)
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	39 flags &= ~PyBUF_WRITABLE;
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	40 if (self->view.obj != NULL)
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	41 res = PyObject_GetBuffer(self->view.obj, view, flags);
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	42 if (view)
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	43 dup_buffer(view, &self->view);
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	44 return res;
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: diff changeset	45 }
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: diff changeset	46
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: diff changeset	47 static void
43439 79b0db0356d3 Whitespace and line lengrth cleanup. Guido van Rossum <guido@python.org> parents: 43423 diff changeset	48 memory_releasebuf(PyMemoryViewObject self, Py_buffer view)
42665 85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: diff changeset	49 {
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	50 PyBuffer_Release(view);
42665 85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: diff changeset	51 }
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: diff changeset	52
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: diff changeset	53 PyDoc_STRVAR(memory_doc,
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: diff changeset	54 "memoryview(object)\n\
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: diff changeset	55 \n\
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: diff changeset	56 Create a new memoryview object which references the given object.");
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: diff changeset	57
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: diff changeset	58 PyObject *
48770 7511f3e672a2 #3560: cleanup C memoryview API Antoine Pitrou <solipsis@pitrou.net> parents: 48683 diff changeset	59 PyMemoryView_FromBuffer(Py_buffer *info)
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: diff changeset	60 {
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	61 PyMemoryViewObject *mview;
43423 0476a2cc5658 Change PyBuffer to Py_buffer to be consistent with other non-object structures like Py_complex. Add some more functionality to the memoryview object. Travis E. Oliphant <oliphant@enthought.com> parents: 43384 diff changeset	62
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	63 mview = (PyMemoryViewObject *)
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	64 PyObject_GC_New(PyMemoryViewObject, &PyMemoryView_Type);
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	65 if (mview == NULL)
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	66 return NULL;
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	67 mview->base = NULL;
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	68 dup_buffer(&mview->view, info);
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	69 /* NOTE: mview->view.obj should already have been incref'ed as
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	70 part of PyBuffer_FillInfo(). */
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	71 _PyObject_GC_TRACK(mview);
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	72 return (PyObject *)mview;
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: diff changeset	73 }
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: diff changeset	74
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: diff changeset	75 PyObject *
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: diff changeset	76 PyMemoryView_FromObject(PyObject *base)
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: diff changeset	77 {
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	78 PyMemoryViewObject *mview;
58645 cd00a94186c9 Merged revisions 77916 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	79 Py_buffer view;
42665 85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: diff changeset	80
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	81 if (!PyObject_CheckBuffer(base)) {
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	82 PyErr_SetString(PyExc_TypeError,
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	83 "cannot make memory view because object does "
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	84 "not have the buffer interface");
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	85 return NULL;
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	86 }
43439 79b0db0356d3 Whitespace and line lengrth cleanup. Guido van Rossum <guido@python.org> parents: 43423 diff changeset	87
58645 cd00a94186c9 Merged revisions 77916 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	88 if (PyObject_GetBuffer(base, &view, PyBUF_FULL_RO) < 0)
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	89 return NULL;
43439 79b0db0356d3 Whitespace and line lengrth cleanup. Guido van Rossum <guido@python.org> parents: 43423 diff changeset	90
58645 cd00a94186c9 Merged revisions 77916 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	91 mview = (PyMemoryViewObject *)PyMemoryView_FromBuffer(&view);
cd00a94186c9 Merged revisions 77916 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	92 if (mview == NULL) {
cd00a94186c9 Merged revisions 77916 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	93 PyBuffer_Release(&view);
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	94 return NULL;
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	95 }
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: diff changeset	96
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	97 mview->base = base;
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	98 Py_INCREF(base);
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	99 return (PyObject *)mview;
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: diff changeset	100 }
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: diff changeset	101
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: diff changeset	102 static PyObject *
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: diff changeset	103 memory_new(PyTypeObject subtype, PyObject args, PyObject *kwds)
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: diff changeset	104 {
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	105 PyObject *obj;
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	106 static char *kwlist[] = {"object", 0};
42665 85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: diff changeset	107
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	108 if (!PyArg_ParseTupleAndKeywords(args, kwds, "O:memoryview", kwlist,
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	109 &obj)) {
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	110 return NULL;
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	111 }
43793 2d8d6855a602 Fixed memoryview constructor. It allowed arbitrary keyword arguments. The bug was found by mykhal from #python. I've also added a small test case in the new test_memoryview.py Christian Heimes <christian@cheimes.de> parents: 43687 diff changeset	112
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	113 return PyMemoryView_FromObject(obj);
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: diff changeset	114 }
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: diff changeset	115
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: diff changeset	116
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: diff changeset	117 static void
43439 79b0db0356d3 Whitespace and line lengrth cleanup. Guido van Rossum <guido@python.org> parents: 43423 diff changeset	118 _strided_copy_nd(char dest, char src, int nd, Py_ssize_t *shape,
43687 6ab64f6b4c03 Fix some Py_ssize_t warnings on Win64 that were probably bugs Neal Norwitz <nnorwitz@gmail.com> parents: 43550 diff changeset	119 Py_ssize_t *strides, Py_ssize_t itemsize, char fort)
42665 85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: diff changeset	120 {
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	121 int k;
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	122 Py_ssize_t outstride;
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: diff changeset	123
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	124 if (nd==0) {
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	125 memcpy(dest, src, itemsize);
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	126 }
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	127 else if (nd == 1) {
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	128 for (k = 0; k<shape[0]; k++) {
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	129 memcpy(dest, src, itemsize);
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	130 dest += itemsize;
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	131 src += strides[0];
42665 85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: diff changeset	132 }
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	133 }
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	134 else {
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	135 if (fort == 'F') {
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	136 /* Copy first dimension first,
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	137 second dimension second, etc...
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	138 Set up the recursive loop backwards so that final
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	139 dimension is actually copied last.
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	140 */
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	141 outstride = itemsize;
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	142 for (k=1; k<nd-1;k++) {
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	143 outstride *= shape[k];
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	144 }
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	145 for (k=0; k<shape[nd-1]; k++) {
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	146 _strided_copy_nd(dest, src, nd-1, shape,
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	147 strides, itemsize, fort);
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	148 dest += outstride;
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	149 src += strides[nd-1];
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	150 }
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: diff changeset	151 }
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	152
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: diff changeset	153 else {
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	154 /* Copy last dimension first,
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	155 second-to-last dimension second, etc.
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	156 Set up the recursion so that the
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	157 first dimension is copied last
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	158 */
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	159 outstride = itemsize;
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	160 for (k=1; k < nd; k++) {
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	161 outstride *= shape[k];
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	162 }
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	163 for (k=0; k<shape[0]; k++) {
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	164 _strided_copy_nd(dest, src, nd-1, shape+1,
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	165 strides+1, itemsize,
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	166 fort);
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	167 dest += outstride;
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	168 src += strides[0];
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	169 }
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: diff changeset	170 }
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	171 }
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	172 return;
42665 85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: diff changeset	173 }
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: diff changeset	174
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: diff changeset	175 void _add_one_to_index_F(int nd, Py_ssize_t index, Py_ssize_t shape);
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: diff changeset	176 void _add_one_to_index_C(int nd, Py_ssize_t index, Py_ssize_t shape);
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: diff changeset	177
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: diff changeset	178 static int
43423 0476a2cc5658 Change PyBuffer to Py_buffer to be consistent with other non-object structures like Py_complex. Add some more functionality to the memoryview object. Travis E. Oliphant <oliphant@enthought.com> parents: 43384 diff changeset	179 _indirect_copy_nd(char dest, Py_buffer view, char fort)
42665 85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: diff changeset	180 {
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	181 Py_ssize_t *indices;
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	182 int k;
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	183 Py_ssize_t elements;
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	184 char *ptr;
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	185 void (func)(int, Py_ssize_t , Py_ssize_t *);
43439 79b0db0356d3 Whitespace and line lengrth cleanup. Guido van Rossum <guido@python.org> parents: 43423 diff changeset	186
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	187 if (view->ndim > PY_SSIZE_T_MAX / sizeof(Py_ssize_t)) {
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	188 PyErr_NoMemory();
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	189 return -1;
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	190 }
43439 79b0db0356d3 Whitespace and line lengrth cleanup. Guido van Rossum <guido@python.org> parents: 43423 diff changeset	191
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	192 indices = (Py_ssize_t )PyMem_Malloc(sizeof(Py_ssize_t)view->ndim);
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	193 if (indices == NULL) {
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	194 PyErr_NoMemory();
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	195 return -1;
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	196 }
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	197 for (k=0; k<view->ndim;k++) {
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	198 indices[k] = 0;
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	199 }
43439 79b0db0356d3 Whitespace and line lengrth cleanup. Guido van Rossum <guido@python.org> parents: 43423 diff changeset	200
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	201 elements = 1;
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	202 for (k=0; k<view->ndim; k++) {
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	203 elements *= view->shape[k];
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	204 }
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	205 if (fort == 'F') {
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	206 func = _add_one_to_index_F;
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	207 }
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	208 else {
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	209 func = _add_one_to_index_C;
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	210 }
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	211 while (elements--) {
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	212 func(view->ndim, indices, view->shape);
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	213 ptr = PyBuffer_GetPointer(view, indices);
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	214 memcpy(dest, ptr, view->itemsize);
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	215 dest += view->itemsize;
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	216 }
43439 79b0db0356d3 Whitespace and line lengrth cleanup. Guido van Rossum <guido@python.org> parents: 43423 diff changeset	217
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	218 PyMem_Free(indices);
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	219 return 0;
42665 85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: diff changeset	220 }
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: diff changeset	221
43439 79b0db0356d3 Whitespace and line lengrth cleanup. Guido van Rossum <guido@python.org> parents: 43423 diff changeset	222 /*
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: diff changeset	223 Get a the data from an object as a contiguous chunk of memory (in
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: diff changeset	224 either 'C' or 'F'ortran order) even if it means copying it into a
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: diff changeset	225 separate memory area.
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: diff changeset	226
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: diff changeset	227 Returns a new reference to a Memory view object. If no copy is needed,
43439 79b0db0356d3 Whitespace and line lengrth cleanup. Guido van Rossum <guido@python.org> parents: 43423 diff changeset	228 the memory view object points to the original memory and holds a
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: diff changeset	229 lock on the original. If a copy is needed, then the memory view object
43439 79b0db0356d3 Whitespace and line lengrth cleanup. Guido van Rossum <guido@python.org> parents: 43423 diff changeset	230 points to a brand-new Bytes object (and holds a memory lock on it).
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: diff changeset	231
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: diff changeset	232 buffertype
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: diff changeset	233
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: diff changeset	234 PyBUF_READ buffer only needs to be read-only
43384 4e57c36f6d2e Fixing the spelling of "writeable" to "writable", particularly PyBUF_WRITEABLE. Sean Reifscheider <jafo@tummy.com> parents: 42671 diff changeset	235 PyBUF_WRITE buffer needs to be writable (give error if not contiguous)
43439 79b0db0356d3 Whitespace and line lengrth cleanup. Guido van Rossum <guido@python.org> parents: 43423 diff changeset	236 PyBUF_SHADOW buffer needs to be writable so shadow it with
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: diff changeset	237 a contiguous buffer if it is not. The view will point to
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: diff changeset	238 the shadow buffer which can be written to and then
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: diff changeset	239 will be copied back into the other buffer when the memory
48623 bf50085fbcd3 #2538: bytes objects can only provide read-only buffers Antoine Pitrou <solipsis@pitrou.net> parents: 48330 diff changeset	240 view is de-allocated. While the shadow buffer is
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	241 being used, it will have an exclusive write lock on
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	242 the original buffer.
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: diff changeset	243 */
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: diff changeset	244
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: diff changeset	245 PyObject *
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: diff changeset	246 PyMemoryView_GetContiguous(PyObject *obj, int buffertype, char fort)
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: diff changeset	247 {
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	248 PyMemoryViewObject *mem;
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	249 PyObject *bytes;
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	250 Py_buffer *view;
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	251 int flags;
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	252 char *dest;
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	253
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	254 if (!PyObject_CheckBuffer(obj)) {
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	255 PyErr_SetString(PyExc_TypeError,
55580 7b495c8f2a24 Merged revisions 73941-73943,74076,74094,74186,74211-74214,74247,74254,74262,74311,74334,74368 via svnmerge from Georg Brandl <georg@python.org> parents: 54828 diff changeset	256 "object does not support the buffer interface");
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	257 return NULL;
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	258 }
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: diff changeset	259
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	260 mem = PyObject_GC_New(PyMemoryViewObject, &PyMemoryView_Type);
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	261 if (mem == NULL)
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	262 return NULL;
43439 79b0db0356d3 Whitespace and line lengrth cleanup. Guido van Rossum <guido@python.org> parents: 43423 diff changeset	263
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	264 view = &mem->view;
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	265 flags = PyBUF_FULL_RO;
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	266 switch(buffertype) {
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	267 case PyBUF_WRITE:
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	268 flags = PyBUF_FULL;
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	269 break;
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	270 }
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	271
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	272 if (PyObject_GetBuffer(obj, view, flags) != 0) {
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	273 Py_DECREF(mem);
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	274 return NULL;
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	275 }
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: diff changeset	276
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	277 if (PyBuffer_IsContiguous(view, fort)) {
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	278 /* no copy needed */
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	279 Py_INCREF(obj);
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	280 mem->base = obj;
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	281 _PyObject_GC_TRACK(mem);
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	282 return (PyObject *)mem;
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	283 }
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	284 /* otherwise a copy is needed */
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	285 if (buffertype == PyBUF_WRITE) {
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	286 Py_DECREF(mem);
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	287 PyErr_SetString(PyExc_BufferError,
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	288 "writable contiguous buffer requested "
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	289 "for a non-contiguousobject.");
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	290 return NULL;
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	291 }
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	292 bytes = PyBytes_FromStringAndSize(NULL, view->len);
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	293 if (bytes == NULL) {
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	294 Py_DECREF(mem);
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	295 return NULL;
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	296 }
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	297 dest = PyBytes_AS_STRING(bytes);
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	298 /* different copying strategy depending on whether
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	299 or not any pointer de-referencing is needed
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	300 */
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	301 /* strided or in-direct copy */
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	302 if (view->suboffsets==NULL) {
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	303 _strided_copy_nd(dest, view->buf, view->ndim, view->shape,
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	304 view->strides, view->itemsize, fort);
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	305 }
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	306 else {
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	307 if (_indirect_copy_nd(dest, view, fort) < 0) {
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	308 Py_DECREF(bytes);
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	309 Py_DECREF(mem);
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	310 return NULL;
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: diff changeset	311 }
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	312 }
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	313 if (buffertype == PyBUF_SHADOW) {
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	314 /* return a shadowed memory-view object */
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	315 view->buf = dest;
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	316 mem->base = PyTuple_Pack(2, obj, bytes);
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	317 Py_DECREF(bytes);
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	318 if (mem->base == NULL) {
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	319 Py_DECREF(mem);
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	320 return NULL;
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: diff changeset	321 }
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	322 }
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	323 else {
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	324 PyBuffer_Release(view); /* XXX ? */
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	325 /* steal the reference */
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	326 mem->base = bytes;
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	327 }
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	328 _PyObject_GC_TRACK(mem);
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	329 return (PyObject *)mem;
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: diff changeset	330 }
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: diff changeset	331
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: diff changeset	332
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: diff changeset	333 static PyObject *
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: diff changeset	334 memory_format_get(PyMemoryViewObject *self)
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: diff changeset	335 {
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	336 return PyUnicode_FromString(self->view.format);
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: diff changeset	337 }
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: diff changeset	338
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: diff changeset	339 static PyObject *
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: diff changeset	340 memory_itemsize_get(PyMemoryViewObject *self)
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: diff changeset	341 {
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	342 return PyLong_FromSsize_t(self->view.itemsize);
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: diff changeset	343 }
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: diff changeset	344
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: diff changeset	345 static PyObject *
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: diff changeset	346 _IntTupleFromSsizet(int len, Py_ssize_t *vals)
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: diff changeset	347 {
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	348 int i;
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	349 PyObject *o;
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	350 PyObject *intTuple;
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: diff changeset	351
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	352 if (vals == NULL) {
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	353 Py_INCREF(Py_None);
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	354 return Py_None;
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	355 }
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	356 intTuple = PyTuple_New(len);
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	357 if (!intTuple) return NULL;
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	358 for(i=0; i<len; i++) {
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	359 o = PyLong_FromSsize_t(vals[i]);
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	360 if (!o) {
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	361 Py_DECREF(intTuple);
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	362 return NULL;
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: diff changeset	363 }
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	364 PyTuple_SET_ITEM(intTuple, i, o);
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	365 }
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	366 return intTuple;
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: diff changeset	367 }
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: diff changeset	368
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: diff changeset	369 static PyObject *
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: diff changeset	370 memory_shape_get(PyMemoryViewObject *self)
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: diff changeset	371 {
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	372 return _IntTupleFromSsizet(self->view.ndim, self->view.shape);
42665 85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: diff changeset	373 }
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: diff changeset	374
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: diff changeset	375 static PyObject *
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: diff changeset	376 memory_strides_get(PyMemoryViewObject *self)
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: diff changeset	377 {
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	378 return _IntTupleFromSsizet(self->view.ndim, self->view.strides);
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: diff changeset	379 }
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: diff changeset	380
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: diff changeset	381 static PyObject *
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: diff changeset	382 memory_suboffsets_get(PyMemoryViewObject *self)
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: diff changeset	383 {
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	384 return _IntTupleFromSsizet(self->view.ndim, self->view.suboffsets);
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: diff changeset	385 }
85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: diff changeset	386
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: diff changeset	387 static PyObject *
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: diff changeset	388 memory_readonly_get(PyMemoryViewObject *self)
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: diff changeset	389 {
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	390 return PyBool_FromLong(self->view.readonly);
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: diff changeset	391 }
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: diff changeset	392
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: diff changeset	393 static PyObject *
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: diff changeset	394 memory_ndim_get(PyMemoryViewObject *self)
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: diff changeset	395 {
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	396 return PyLong_FromLong(self->view.ndim);
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: diff changeset	397 }
85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: diff changeset	398
43439 79b0db0356d3 Whitespace and line lengrth cleanup. Guido van Rossum <guido@python.org> parents: 43423 diff changeset	399 static PyGetSetDef memory_getsetlist[] ={
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	400 {"format", (getter)memory_format_get, NULL, NULL},
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	401 {"itemsize", (getter)memory_itemsize_get, NULL, NULL},
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	402 {"shape", (getter)memory_shape_get, NULL, NULL},
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	403 {"strides", (getter)memory_strides_get, NULL, NULL},
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	404 {"suboffsets", (getter)memory_suboffsets_get, NULL, NULL},
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	405 {"readonly", (getter)memory_readonly_get, NULL, NULL},
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	406 {"ndim", (getter)memory_ndim_get, NULL, NULL},
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	407 {NULL, NULL, NULL, NULL},
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: diff changeset	408 };
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: diff changeset	409
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: diff changeset	410
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: diff changeset	411 static PyObject *
42669 2c51be9904de Code review of the new buffer protocol. Mostly add questions that should Neal Norwitz <nnorwitz@gmail.com> parents: 42665 diff changeset	412 memory_tobytes(PyMemoryViewObject mem, PyObject noargs)
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: diff changeset	413 {
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	414 return PyObject_CallFunctionObjArgs(
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	415 (PyObject *) &PyBytes_Type, mem, NULL);
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: diff changeset	416 }
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: diff changeset	417
48782 501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	418 /* TODO: rewrite this function using the struct module to unpack
501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	419 each buffer item */
501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	420
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: diff changeset	421 static PyObject *
42669 2c51be9904de Code review of the new buffer protocol. Mostly add questions that should Neal Norwitz <nnorwitz@gmail.com> parents: 42665 diff changeset	422 memory_tolist(PyMemoryViewObject mem, PyObject noargs)
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: diff changeset	423 {
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	424 Py_buffer *view = &(mem->view);
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	425 Py_ssize_t i;
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	426 PyObject res, item;
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	427 char *buf;
48782 501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	428
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	429 if (strcmp(view->format, "B") \|\| view->itemsize != 1) {
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	430 PyErr_SetString(PyExc_NotImplementedError,
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	431 "tolist() only supports byte views");
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	432 return NULL;
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	433 }
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	434 if (view->ndim != 1) {
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	435 PyErr_SetString(PyExc_NotImplementedError,
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	436 "tolist() only supports one-dimensional objects");
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	437 return NULL;
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	438 }
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	439 res = PyList_New(view->len);
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	440 if (res == NULL)
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	441 return NULL;
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	442 buf = view->buf;
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	443 for (i = 0; i < view->len; i++) {
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	444 item = PyLong_FromUnsignedLong((unsigned char) *buf);
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	445 if (item == NULL) {
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	446 Py_DECREF(res);
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	447 return NULL;
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	448 }
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	449 PyList_SET_ITEM(res, i, item);
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	450 buf++;
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	451 }
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	452 return res;
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: diff changeset	453 }
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: diff changeset	454
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: diff changeset	455 static PyMethodDef memory_methods[] = {
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	456 {"tobytes", (PyCFunction)memory_tobytes, METH_NOARGS, NULL},
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	457 {"tolist", (PyCFunction)memory_tolist, METH_NOARGS, NULL},
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	458 {NULL, NULL} /* sentinel */
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: diff changeset	459 };
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: diff changeset	460
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: diff changeset	461
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: diff changeset	462 static void
85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: diff changeset	463 memory_dealloc(PyMemoryViewObject *self)
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: diff changeset	464 {
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	465 _PyObject_GC_UNTRACK(self);
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	466 if (self->view.obj != NULL) {
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	467 if (self->base && PyTuple_Check(self->base)) {
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	468 /* Special case when first element is generic object
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	469 with buffer interface and the second element is a
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	470 contiguous "shadow" that must be copied back into
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	471 the data areay of the first tuple element before
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	472 releasing the buffer on the first element.
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	473 */
43439 79b0db0356d3 Whitespace and line lengrth cleanup. Guido van Rossum <guido@python.org> parents: 43423 diff changeset	474
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	475 PyObject_CopyData(PyTuple_GET_ITEM(self->base,0),
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	476 PyTuple_GET_ITEM(self->base,1));
42665 85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: diff changeset	477
50490 26045ed0c26e Merged revisions 68200 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50083 diff changeset	478 /* The view member should have readonly == -1 in
26045ed0c26e Merged revisions 68200 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50083 diff changeset	479 this instance indicating that the memory can
26045ed0c26e Merged revisions 68200 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50083 diff changeset	480 be "locked" and was locked and will be unlocked
26045ed0c26e Merged revisions 68200 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50083 diff changeset	481 again after this call.
26045ed0c26e Merged revisions 68200 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50083 diff changeset	482 */
26045ed0c26e Merged revisions 68200 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50083 diff changeset	483 PyBuffer_Release(&(self->view));
42665 85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: diff changeset	484 }
50490 26045ed0c26e Merged revisions 68200 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50083 diff changeset	485 else {
26045ed0c26e Merged revisions 68200 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50083 diff changeset	486 PyBuffer_Release(&(self->view));
26045ed0c26e Merged revisions 68200 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50083 diff changeset	487 }
26045ed0c26e Merged revisions 68200 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50083 diff changeset	488 Py_CLEAR(self->base);
26045ed0c26e Merged revisions 68200 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50083 diff changeset	489 }
26045ed0c26e Merged revisions 68200 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50083 diff changeset	490 PyObject_GC_Del(self);
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: diff changeset	491 }
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: diff changeset	492
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: diff changeset	493 static PyObject *
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: diff changeset	494 memory_repr(PyMemoryViewObject *self)
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: diff changeset	495 {
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	496 return PyUnicode_FromFormat("<memory at %p>", self);
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: diff changeset	497 }
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: diff changeset	498
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: diff changeset	499 /* Sequence methods */
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: diff changeset	500 static Py_ssize_t
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: diff changeset	501 memory_length(PyMemoryViewObject *self)
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: diff changeset	502 {
50490 26045ed0c26e Merged revisions 68200 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50083 diff changeset	503 return get_shape0(&self->view);
42665 85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: diff changeset	504 }
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: diff changeset	505
54828 b4d0c020e357 Issue 6329: Fix iteration for memoryviews. Raymond Hettinger <python@rcn.com> parents: 51468 diff changeset	506 /* Alternate version of memory_subcript that only accepts indices.
b4d0c020e357 Issue 6329: Fix iteration for memoryviews. Raymond Hettinger <python@rcn.com> parents: 51468 diff changeset	507 Used by PySeqIter_New().
b4d0c020e357 Issue 6329: Fix iteration for memoryviews. Raymond Hettinger <python@rcn.com> parents: 51468 diff changeset	508 */
b4d0c020e357 Issue 6329: Fix iteration for memoryviews. Raymond Hettinger <python@rcn.com> parents: 51468 diff changeset	509 static PyObject *
b4d0c020e357 Issue 6329: Fix iteration for memoryviews. Raymond Hettinger <python@rcn.com> parents: 51468 diff changeset	510 memory_item(PyMemoryViewObject *self, Py_ssize_t result)
b4d0c020e357 Issue 6329: Fix iteration for memoryviews. Raymond Hettinger <python@rcn.com> parents: 51468 diff changeset	511 {
b4d0c020e357 Issue 6329: Fix iteration for memoryviews. Raymond Hettinger <python@rcn.com> parents: 51468 diff changeset	512 Py_buffer *view = &(self->view);
b4d0c020e357 Issue 6329: Fix iteration for memoryviews. Raymond Hettinger <python@rcn.com> parents: 51468 diff changeset	513
b4d0c020e357 Issue 6329: Fix iteration for memoryviews. Raymond Hettinger <python@rcn.com> parents: 51468 diff changeset	514 if (view->ndim == 0) {
b4d0c020e357 Issue 6329: Fix iteration for memoryviews. Raymond Hettinger <python@rcn.com> parents: 51468 diff changeset	515 PyErr_SetString(PyExc_IndexError,
b4d0c020e357 Issue 6329: Fix iteration for memoryviews. Raymond Hettinger <python@rcn.com> parents: 51468 diff changeset	516 "invalid indexing of 0-dim memory");
b4d0c020e357 Issue 6329: Fix iteration for memoryviews. Raymond Hettinger <python@rcn.com> parents: 51468 diff changeset	517 return NULL;
b4d0c020e357 Issue 6329: Fix iteration for memoryviews. Raymond Hettinger <python@rcn.com> parents: 51468 diff changeset	518 }
b4d0c020e357 Issue 6329: Fix iteration for memoryviews. Raymond Hettinger <python@rcn.com> parents: 51468 diff changeset	519 if (view->ndim == 1) {
b4d0c020e357 Issue 6329: Fix iteration for memoryviews. Raymond Hettinger <python@rcn.com> parents: 51468 diff changeset	520 /* Return a bytes object */
b4d0c020e357 Issue 6329: Fix iteration for memoryviews. Raymond Hettinger <python@rcn.com> parents: 51468 diff changeset	521 char *ptr;
b4d0c020e357 Issue 6329: Fix iteration for memoryviews. Raymond Hettinger <python@rcn.com> parents: 51468 diff changeset	522 ptr = (char *)view->buf;
b4d0c020e357 Issue 6329: Fix iteration for memoryviews. Raymond Hettinger <python@rcn.com> parents: 51468 diff changeset	523 if (result < 0) {
b4d0c020e357 Issue 6329: Fix iteration for memoryviews. Raymond Hettinger <python@rcn.com> parents: 51468 diff changeset	524 result += get_shape0(view);
b4d0c020e357 Issue 6329: Fix iteration for memoryviews. Raymond Hettinger <python@rcn.com> parents: 51468 diff changeset	525 }
b4d0c020e357 Issue 6329: Fix iteration for memoryviews. Raymond Hettinger <python@rcn.com> parents: 51468 diff changeset	526 if ((result < 0) \|\| (result >= get_shape0(view))) {
b4d0c020e357 Issue 6329: Fix iteration for memoryviews. Raymond Hettinger <python@rcn.com> parents: 51468 diff changeset	527 PyErr_SetString(PyExc_IndexError,
b4d0c020e357 Issue 6329: Fix iteration for memoryviews. Raymond Hettinger <python@rcn.com> parents: 51468 diff changeset	528 "index out of bounds");
b4d0c020e357 Issue 6329: Fix iteration for memoryviews. Raymond Hettinger <python@rcn.com> parents: 51468 diff changeset	529 return NULL;
b4d0c020e357 Issue 6329: Fix iteration for memoryviews. Raymond Hettinger <python@rcn.com> parents: 51468 diff changeset	530 }
b4d0c020e357 Issue 6329: Fix iteration for memoryviews. Raymond Hettinger <python@rcn.com> parents: 51468 diff changeset	531 if (view->strides == NULL)
b4d0c020e357 Issue 6329: Fix iteration for memoryviews. Raymond Hettinger <python@rcn.com> parents: 51468 diff changeset	532 ptr += view->itemsize * result;
b4d0c020e357 Issue 6329: Fix iteration for memoryviews. Raymond Hettinger <python@rcn.com> parents: 51468 diff changeset	533 else
b4d0c020e357 Issue 6329: Fix iteration for memoryviews. Raymond Hettinger <python@rcn.com> parents: 51468 diff changeset	534 ptr += view->strides[0] * result;
b4d0c020e357 Issue 6329: Fix iteration for memoryviews. Raymond Hettinger <python@rcn.com> parents: 51468 diff changeset	535 if (view->suboffsets != NULL &&
b4d0c020e357 Issue 6329: Fix iteration for memoryviews. Raymond Hettinger <python@rcn.com> parents: 51468 diff changeset	536 view->suboffsets[0] >= 0) {
b4d0c020e357 Issue 6329: Fix iteration for memoryviews. Raymond Hettinger <python@rcn.com> parents: 51468 diff changeset	537 ptr = ((char *)ptr) + view->suboffsets[0];
b4d0c020e357 Issue 6329: Fix iteration for memoryviews. Raymond Hettinger <python@rcn.com> parents: 51468 diff changeset	538 }
b4d0c020e357 Issue 6329: Fix iteration for memoryviews. Raymond Hettinger <python@rcn.com> parents: 51468 diff changeset	539 return PyBytes_FromStringAndSize(ptr, view->itemsize);
b4d0c020e357 Issue 6329: Fix iteration for memoryviews. Raymond Hettinger <python@rcn.com> parents: 51468 diff changeset	540 } else {
b4d0c020e357 Issue 6329: Fix iteration for memoryviews. Raymond Hettinger <python@rcn.com> parents: 51468 diff changeset	541 /* Return a new memory-view object */
b4d0c020e357 Issue 6329: Fix iteration for memoryviews. Raymond Hettinger <python@rcn.com> parents: 51468 diff changeset	542 Py_buffer newview;
b4d0c020e357 Issue 6329: Fix iteration for memoryviews. Raymond Hettinger <python@rcn.com> parents: 51468 diff changeset	543 memset(&newview, 0, sizeof(newview));
b4d0c020e357 Issue 6329: Fix iteration for memoryviews. Raymond Hettinger <python@rcn.com> parents: 51468 diff changeset	544 /* XXX: This needs to be fixed so it actually returns a sub-view */
b4d0c020e357 Issue 6329: Fix iteration for memoryviews. Raymond Hettinger <python@rcn.com> parents: 51468 diff changeset	545 return PyMemoryView_FromBuffer(&newview);
b4d0c020e357 Issue 6329: Fix iteration for memoryviews. Raymond Hettinger <python@rcn.com> parents: 51468 diff changeset	546 }
b4d0c020e357 Issue 6329: Fix iteration for memoryviews. Raymond Hettinger <python@rcn.com> parents: 51468 diff changeset	547 }
b4d0c020e357 Issue 6329: Fix iteration for memoryviews. Raymond Hettinger <python@rcn.com> parents: 51468 diff changeset	548
43439 79b0db0356d3 Whitespace and line lengrth cleanup. Guido van Rossum <guido@python.org> parents: 43423 diff changeset	549 /*
43423 0476a2cc5658 Change PyBuffer to Py_buffer to be consistent with other non-object structures like Py_complex. Add some more functionality to the memoryview object. Travis E. Oliphant <oliphant@enthought.com> parents: 43384 diff changeset	550 mem[obj] returns a bytes object holding the data for one element if
0476a2cc5658 Change PyBuffer to Py_buffer to be consistent with other non-object structures like Py_complex. Add some more functionality to the memoryview object. Travis E. Oliphant <oliphant@enthought.com> parents: 43384 diff changeset	551 obj fully indexes the memory view or another memory-view object
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	552 if it does not.
43439 79b0db0356d3 Whitespace and line lengrth cleanup. Guido van Rossum <guido@python.org> parents: 43423 diff changeset	553
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	554 0-d memory-view objects can be referenced using ... or () but
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	555 not with anything else.
43423 0476a2cc5658 Change PyBuffer to Py_buffer to be consistent with other non-object structures like Py_complex. Add some more functionality to the memoryview object. Travis E. Oliphant <oliphant@enthought.com> parents: 43384 diff changeset	556 */
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: diff changeset	557 static PyObject *
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: diff changeset	558 memory_subscript(PyMemoryViewObject self, PyObject key)
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: diff changeset	559 {
50083 725192c64c28 Merged revisions 67650 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 49136 diff changeset	560 Py_buffer *view;
725192c64c28 Merged revisions 67650 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 49136 diff changeset	561 view = &(self->view);
725192c64c28 Merged revisions 67650 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 49136 diff changeset	562
725192c64c28 Merged revisions 67650 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 49136 diff changeset	563 if (view->ndim == 0) {
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	564 if (key == Py_Ellipsis \|\|
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	565 (PyTuple_Check(key) && PyTuple_GET_SIZE(key)==0)) {
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	566 Py_INCREF(self);
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	567 return (PyObject *)self;
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	568 }
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	569 else {
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	570 PyErr_SetString(PyExc_IndexError,
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	571 "invalid indexing of 0-dim memory");
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	572 return NULL;
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	573 }
50083 725192c64c28 Merged revisions 67650 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 49136 diff changeset	574 }
725192c64c28 Merged revisions 67650 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 49136 diff changeset	575 if (PyIndex_Check(key)) {
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	576 Py_ssize_t result;
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	577 result = PyNumber_AsSsize_t(key, NULL);
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	578 if (result == -1 && PyErr_Occurred())
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	579 return NULL;
54828 b4d0c020e357 Issue 6329: Fix iteration for memoryviews. Raymond Hettinger <python@rcn.com> parents: 51468 diff changeset	580 return memory_item(self, result);
50083 725192c64c28 Merged revisions 67650 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 49136 diff changeset	581 }
725192c64c28 Merged revisions 67650 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 49136 diff changeset	582 else if (PySlice_Check(key)) {
50490 26045ed0c26e Merged revisions 68200 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50083 diff changeset	583 Py_ssize_t start, stop, step, slicelength;
26045ed0c26e Merged revisions 68200 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50083 diff changeset	584
50083 725192c64c28 Merged revisions 67650 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 49136 diff changeset	585 if (PySlice_GetIndicesEx((PySliceObject*)key, get_shape0(view),
50490 26045ed0c26e Merged revisions 68200 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50083 diff changeset	586 &start, &stop, &step, &slicelength) < 0) {
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	587 return NULL;
50490 26045ed0c26e Merged revisions 68200 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50083 diff changeset	588 }
50083 725192c64c28 Merged revisions 67650 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 49136 diff changeset	589
50490 26045ed0c26e Merged revisions 68200 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50083 diff changeset	590 if (step == 1 && view->ndim == 1) {
26045ed0c26e Merged revisions 68200 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50083 diff changeset	591 Py_buffer newview;
26045ed0c26e Merged revisions 68200 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50083 diff changeset	592 void newbuf = (char ) view->buf
26045ed0c26e Merged revisions 68200 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50083 diff changeset	593 + start * view->itemsize;
26045ed0c26e Merged revisions 68200 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50083 diff changeset	594 int newflags = view->readonly
26045ed0c26e Merged revisions 68200 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50083 diff changeset	595 ? PyBUF_CONTIG_RO : PyBUF_CONTIG;
50083 725192c64c28 Merged revisions 67650 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 49136 diff changeset	596
50490 26045ed0c26e Merged revisions 68200 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50083 diff changeset	597 /* XXX There should be an API to create a subbuffer */
26045ed0c26e Merged revisions 68200 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50083 diff changeset	598 if (view->obj != NULL) {
26045ed0c26e Merged revisions 68200 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50083 diff changeset	599 if (PyObject_GetBuffer(view->obj, &newview, newflags) == -1)
26045ed0c26e Merged revisions 68200 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50083 diff changeset	600 return NULL;
26045ed0c26e Merged revisions 68200 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50083 diff changeset	601 }
26045ed0c26e Merged revisions 68200 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50083 diff changeset	602 else {
26045ed0c26e Merged revisions 68200 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50083 diff changeset	603 newview = *view;
26045ed0c26e Merged revisions 68200 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50083 diff changeset	604 }
26045ed0c26e Merged revisions 68200 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50083 diff changeset	605 newview.buf = newbuf;
26045ed0c26e Merged revisions 68200 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50083 diff changeset	606 newview.len = slicelength * newview.itemsize;
26045ed0c26e Merged revisions 68200 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50083 diff changeset	607 newview.format = view->format;
26045ed0c26e Merged revisions 68200 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50083 diff changeset	608 newview.shape = &(newview.smalltable[0]);
26045ed0c26e Merged revisions 68200 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50083 diff changeset	609 newview.shape[0] = slicelength;
26045ed0c26e Merged revisions 68200 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50083 diff changeset	610 newview.strides = &(newview.itemsize);
26045ed0c26e Merged revisions 68200 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50083 diff changeset	611 return PyMemoryView_FromBuffer(&newview);
26045ed0c26e Merged revisions 68200 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50083 diff changeset	612 }
26045ed0c26e Merged revisions 68200 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50083 diff changeset	613 PyErr_SetNone(PyExc_NotImplementedError);
26045ed0c26e Merged revisions 68200 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50083 diff changeset	614 return NULL;
50083 725192c64c28 Merged revisions 67650 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 49136 diff changeset	615 }
725192c64c28 Merged revisions 67650 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 49136 diff changeset	616 PyErr_Format(PyExc_TypeError,
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	617 "cannot index memory using \"%.200s\"",
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	618 key->ob_type->tp_name);
50083 725192c64c28 Merged revisions 67650 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 49136 diff changeset	619 return NULL;
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: diff changeset	620 }
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: diff changeset	621
43550 4ea945cbbb6d Fix problems with memoryview object. There is still more to do to finish PEP 3118. The memory-view object needs to be fleshed out and the struct module needs to be modified. Travis E. Oliphant <oliphant@enthought.com> parents: 43488 diff changeset	622
4ea945cbbb6d Fix problems with memoryview object. There is still more to do to finish PEP 3118. The memory-view object needs to be fleshed out and the struct module needs to be modified. Travis E. Oliphant <oliphant@enthought.com> parents: 43488 diff changeset	623 /* Need to support assigning memory if we can */
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: diff changeset	624 static int
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: diff changeset	625 memory_ass_sub(PyMemoryViewObject self, PyObject key, PyObject *value)
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: diff changeset	626 {
48782 501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	627 Py_ssize_t start, len, bytelen, i;
501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	628 Py_buffer srcview;
501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	629 Py_buffer *view = &(self->view);
501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	630 char srcbuf, destbuf;
501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	631
501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	632 if (view->readonly) {
501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	633 PyErr_SetString(PyExc_TypeError,
501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	634 "cannot modify read-only memory");
501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	635 return -1;
501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	636 }
501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	637 if (view->ndim != 1) {
501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	638 PyErr_SetNone(PyExc_NotImplementedError);
501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	639 return -1;
501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	640 }
501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	641 if (PyIndex_Check(key)) {
501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	642 start = PyNumber_AsSsize_t(key, NULL);
501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	643 if (start == -1 && PyErr_Occurred())
501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	644 return -1;
501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	645 if (start < 0) {
50083 725192c64c28 Merged revisions 67650 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 49136 diff changeset	646 start += get_shape0(view);
48782 501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	647 }
50083 725192c64c28 Merged revisions 67650 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 49136 diff changeset	648 if ((start < 0) \|\| (start >= get_shape0(view))) {
48782 501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	649 PyErr_SetString(PyExc_IndexError,
501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	650 "index out of bounds");
501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	651 return -1;
501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	652 }
501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	653 len = 1;
501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	654 }
501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	655 else if (PySlice_Check(key)) {
501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	656 Py_ssize_t stop, step;
501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	657
50083 725192c64c28 Merged revisions 67650 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 49136 diff changeset	658 if (PySlice_GetIndicesEx((PySliceObject*)key, get_shape0(view),
48782 501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	659 &start, &stop, &step, &len) < 0) {
501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	660 return -1;
501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	661 }
501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	662 if (step != 1) {
501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	663 PyErr_SetNone(PyExc_NotImplementedError);
501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	664 return -1;
501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	665 }
501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	666 }
501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	667 else {
501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	668 PyErr_Format(PyExc_TypeError,
501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	669 "cannot index memory using \"%.200s\"",
501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	670 key->ob_type->tp_name);
501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	671 return -1;
501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	672 }
501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	673 if (PyObject_GetBuffer(value, &srcview, PyBUF_CONTIG_RO) == -1) {
501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	674 return -1;
501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	675 }
501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	676 /* XXX should we allow assignment of different item sizes
501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	677 as long as the byte length is the same?
501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	678 (e.g. assign 2 shorts to a 4-byte slice) */
501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	679 if (srcview.itemsize != view->itemsize) {
501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	680 PyErr_Format(PyExc_TypeError,
501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	681 "mismatching item sizes for \"%.200s\" and \"%.200s\"",
501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	682 view->obj->ob_type->tp_name, srcview.obj->ob_type->tp_name);
501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	683 goto _error;
501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	684 }
50083 725192c64c28 Merged revisions 67650 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 49136 diff changeset	685 bytelen = len * view->itemsize;
725192c64c28 Merged revisions 67650 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 49136 diff changeset	686 if (bytelen != srcview.len) {
48782 501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	687 PyErr_SetString(PyExc_ValueError,
501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	688 "cannot modify size of memoryview object");
501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	689 goto _error;
501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	690 }
501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	691 /* Do the actual copy */
501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	692 destbuf = (char ) view->buf + start view->itemsize;
501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	693 srcbuf = (char *) srcview.buf;
501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	694 if (destbuf + bytelen < srcbuf \|\| srcbuf + bytelen < destbuf)
501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	695 /* No overlapping */
501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	696 memcpy(destbuf, srcbuf, bytelen);
501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	697 else if (destbuf < srcbuf) {
501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	698 /* Copy in ascending order */
501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	699 for (i = 0; i < bytelen; i++)
501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	700 destbuf[i] = srcbuf[i];
501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	701 }
501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	702 else {
501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	703 /* Copy in descencing order */
501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	704 for (i = bytelen - 1; i >= 0; i--)
501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	705 destbuf[i] = srcbuf[i];
501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	706 }
501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	707
501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	708 PyBuffer_Release(&srcview);
501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	709 return 0;
501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	710
501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	711 _error:
501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	712 PyBuffer_Release(&srcview);
501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	713 return -1;
42665 85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: diff changeset	714 }
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: diff changeset	715
48782 501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	716 static PyObject *
501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	717 memory_richcompare(PyObject v, PyObject w, int op)
501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	718 {
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	719 Py_buffer vv, ww;
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	720 int equal = 0;
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	721 PyObject *res;
48782 501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	722
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	723 vv.obj = NULL;
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	724 ww.obj = NULL;
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	725 if (op != Py_EQ && op != Py_NE)
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	726 goto _notimpl;
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	727 if (PyObject_GetBuffer(v, &vv, PyBUF_CONTIG_RO) == -1) {
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	728 PyErr_Clear();
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	729 goto _notimpl;
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	730 }
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	731 if (PyObject_GetBuffer(w, &ww, PyBUF_CONTIG_RO) == -1) {
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	732 PyErr_Clear();
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	733 goto _notimpl;
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	734 }
48782 501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	735
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	736 if (vv.itemsize != ww.itemsize \|\| vv.len != ww.len)
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	737 goto _end;
48782 501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	738
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	739 equal = !memcmp(vv.buf, ww.buf, vv.len);
48782 501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	740
501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	741 _end:
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	742 PyBuffer_Release(&vv);
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	743 PyBuffer_Release(&ww);
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	744 if ((equal && op == Py_EQ) \|\| (!equal && op == Py_NE))
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	745 res = Py_True;
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	746 else
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	747 res = Py_False;
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	748 Py_INCREF(res);
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	749 return res;
48782 501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	750
501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	751 _notimpl:
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	752 PyBuffer_Release(&vv);
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	753 PyBuffer_Release(&ww);
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	754 Py_INCREF(Py_NotImplemented);
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	755 return Py_NotImplemented;
48782 501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	756 }
501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	757
501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	758
48928 696f5d8419f2 #3712: The memoryview object had a reference leak and didn't support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 48782 diff changeset	759 static int
696f5d8419f2 #3712: The memoryview object had a reference leak and didn't support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 48782 diff changeset	760 memory_traverse(PyMemoryViewObject self, visitproc visit, void arg)
696f5d8419f2 #3712: The memoryview object had a reference leak and didn't support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 48782 diff changeset	761 {
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	762 if (self->base != NULL)
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	763 Py_VISIT(self->base);
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	764 if (self->view.obj != NULL)
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	765 Py_VISIT(self->view.obj);
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	766 return 0;
48928 696f5d8419f2 #3712: The memoryview object had a reference leak and didn't support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 48782 diff changeset	767 }
696f5d8419f2 #3712: The memoryview object had a reference leak and didn't support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 48782 diff changeset	768
696f5d8419f2 #3712: The memoryview object had a reference leak and didn't support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 48782 diff changeset	769 static int
696f5d8419f2 #3712: The memoryview object had a reference leak and didn't support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 48782 diff changeset	770 memory_clear(PyMemoryViewObject *self)
696f5d8419f2 #3712: The memoryview object had a reference leak and didn't support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 48782 diff changeset	771 {
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	772 Py_CLEAR(self->base);
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	773 PyBuffer_Release(&self->view);
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	774 return 0;
48928 696f5d8419f2 #3712: The memoryview object had a reference leak and didn't support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 48782 diff changeset	775 }
696f5d8419f2 #3712: The memoryview object had a reference leak and didn't support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 48782 diff changeset	776
696f5d8419f2 #3712: The memoryview object had a reference leak and didn't support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 48782 diff changeset	777
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: diff changeset	778 /* As mapping */
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: diff changeset	779 static PyMappingMethods memory_as_mapping = {
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	780 (lenfunc)memory_length, /* mp_length */
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	781 (binaryfunc)memory_subscript, /* mp_subscript */
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	782 (objobjargproc)memory_ass_sub, /* mp_ass_subscript */
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: diff changeset	783 };
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: diff changeset	784
54828 b4d0c020e357 Issue 6329: Fix iteration for memoryviews. Raymond Hettinger <python@rcn.com> parents: 51468 diff changeset	785 static PySequenceMethods memory_as_sequence = {
b4d0c020e357 Issue 6329: Fix iteration for memoryviews. Raymond Hettinger <python@rcn.com> parents: 51468 diff changeset	786 0, /* sq_length */
b4d0c020e357 Issue 6329: Fix iteration for memoryviews. Raymond Hettinger <python@rcn.com> parents: 51468 diff changeset	787 0, /* sq_concat */
b4d0c020e357 Issue 6329: Fix iteration for memoryviews. Raymond Hettinger <python@rcn.com> parents: 51468 diff changeset	788 0, /* sq_repeat */
b4d0c020e357 Issue 6329: Fix iteration for memoryviews. Raymond Hettinger <python@rcn.com> parents: 51468 diff changeset	789 (ssizeargfunc)memory_item, /* sq_item */
b4d0c020e357 Issue 6329: Fix iteration for memoryviews. Raymond Hettinger <python@rcn.com> parents: 51468 diff changeset	790 };
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: diff changeset	791
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: diff changeset	792 /* Buffer methods */
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: diff changeset	793
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: diff changeset	794 static PyBufferProcs memory_as_buffer = {
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	795 (getbufferproc)memory_getbuf, /* bf_getbuffer */
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	796 (releasebufferproc)memory_releasebuf, /* bf_releasebuffer */
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: diff changeset	797 };
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: diff changeset	798
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: diff changeset	799
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: diff changeset	800 PyTypeObject PyMemoryView_Type = {
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	801 PyVarObject_HEAD_INIT(&PyType_Type, 0)
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	802 "memoryview",
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	803 sizeof(PyMemoryViewObject),
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	804 0,
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	805 (destructor)memory_dealloc, /* tp_dealloc */
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	806 0, /* tp_print */
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	807 0, /* tp_getattr */
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	808 0, /* tp_setattr */
51271 87fbbf22adf3 Merged revisions 69214 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 50501 diff changeset	809 0, /* tp_reserved */
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	810 (reprfunc)memory_repr, /* tp_repr */
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	811 0, /* tp_as_number */
54828 b4d0c020e357 Issue 6329: Fix iteration for memoryviews. Raymond Hettinger <python@rcn.com> parents: 51468 diff changeset	812 &memory_as_sequence, /* tp_as_sequence */
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	813 &memory_as_mapping, /* tp_as_mapping */
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	814 0, /* tp_hash */
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	815 0, /* tp_call */
51468 4313b4d4bdc7 Merged revisions 69438 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51271 diff changeset	816 0, /* tp_str */
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	817 PyObject_GenericGetAttr, /* tp_getattro */
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	818 0, /* tp_setattro */
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	819 &memory_as_buffer, /* tp_as_buffer */
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	820 Py_TPFLAGS_DEFAULT \| Py_TPFLAGS_HAVE_GC, /* tp_flags */
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	821 memory_doc, /* tp_doc */
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	822 (traverseproc)memory_traverse, /* tp_traverse */
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	823 (inquiry)memory_clear, /* tp_clear */
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	824 memory_richcompare, /* tp_richcompare */
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	825 0, /* tp_weaklistoffset */
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	826 0, /* tp_iter */
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	827 0, /* tp_iternext */
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	828 memory_methods, /* tp_methods */
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	829 0, /* tp_members */
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	830 memory_getsetlist, /* tp_getset */
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	831 0, /* tp_base */
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	832 0, /* tp_dict */
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	833 0, /* tp_descr_get */
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	834 0, /* tp_descr_set */
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	835 0, /* tp_dictoffset */
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	836 0, /* tp_init */
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	837 0, /* tp_alloc */
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	838 memory_new, /* tp_new */
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: diff changeset	839 };

Mercurial > cpython-lru_cache-weakref

annotate Objects/memoryobject.c @ 58645:cd00a94186c9