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

annotate Objects/memoryobject.c @ 65589:46bbbdcd777f

Refactor interesting use of try-finally.

author	Georg Brandl <georg@python.org>
date	Fri, 22 Oct 2010 06:35:59 +0000
parents	ba54096b7a42
children	4d1ab2d25baf

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
64584 ba54096b7a42 Issue #9757: memoryview objects get a release() method to release the Antoine Pitrou <solipsis@pitrou.net> parents: 64361 diff changeset	6 #define IS_RELEASED(memobj) \
ba54096b7a42 Issue #9757: memoryview objects get a release() method to release the Antoine Pitrou <solipsis@pitrou.net> parents: 64361 diff changeset	7 (((PyMemoryViewObject *) memobj)->view.buf == NULL)
ba54096b7a42 Issue #9757: memoryview objects get a release() method to release the Antoine Pitrou <solipsis@pitrou.net> parents: 64361 diff changeset	8
ba54096b7a42 Issue #9757: memoryview objects get a release() method to release the Antoine Pitrou <solipsis@pitrou.net> parents: 64361 diff changeset	9 #define CHECK_RELEASED(memobj) \
ba54096b7a42 Issue #9757: memoryview objects get a release() method to release the Antoine Pitrou <solipsis@pitrou.net> parents: 64361 diff changeset	10 if (IS_RELEASED(memobj)) { \
ba54096b7a42 Issue #9757: memoryview objects get a release() method to release the Antoine Pitrou <solipsis@pitrou.net> parents: 64361 diff changeset	11 PyErr_SetString(PyExc_ValueError, \
ba54096b7a42 Issue #9757: memoryview objects get a release() method to release the Antoine Pitrou <solipsis@pitrou.net> parents: 64361 diff changeset	12 "operation forbidden on released memoryview object"); \
ba54096b7a42 Issue #9757: memoryview objects get a release() method to release the Antoine Pitrou <solipsis@pitrou.net> parents: 64361 diff changeset	13 return NULL; \
ba54096b7a42 Issue #9757: memoryview objects get a release() method to release the Antoine Pitrou <solipsis@pitrou.net> parents: 64361 diff changeset	14 }
ba54096b7a42 Issue #9757: memoryview objects get a release() method to release the Antoine Pitrou <solipsis@pitrou.net> parents: 64361 diff changeset	15
ba54096b7a42 Issue #9757: memoryview objects get a release() method to release the Antoine Pitrou <solipsis@pitrou.net> parents: 64361 diff changeset	16 #define CHECK_RELEASED_INT(memobj) \
ba54096b7a42 Issue #9757: memoryview objects get a release() method to release the Antoine Pitrou <solipsis@pitrou.net> parents: 64361 diff changeset	17 if (IS_RELEASED(memobj)) { \
ba54096b7a42 Issue #9757: memoryview objects get a release() method to release the Antoine Pitrou <solipsis@pitrou.net> parents: 64361 diff changeset	18 PyErr_SetString(PyExc_ValueError, \
ba54096b7a42 Issue #9757: memoryview objects get a release() method to release the Antoine Pitrou <solipsis@pitrou.net> parents: 64361 diff changeset	19 "operation forbidden on released memoryview object"); \
ba54096b7a42 Issue #9757: memoryview objects get a release() method to release the Antoine Pitrou <solipsis@pitrou.net> parents: 64361 diff changeset	20 return -1; \
ba54096b7a42 Issue #9757: memoryview objects get a release() method to release the Antoine Pitrou <solipsis@pitrou.net> parents: 64361 diff changeset	21 }
ba54096b7a42 Issue #9757: memoryview objects get a release() method to release the Antoine Pitrou <solipsis@pitrou.net> parents: 64361 diff changeset	22
50083 725192c64c28 Merged revisions 67650 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 49136 diff changeset	23 static Py_ssize_t
725192c64c28 Merged revisions 67650 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 49136 diff changeset	24 get_shape0(Py_buffer *buf)
725192c64c28 Merged revisions 67650 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 49136 diff changeset	25 {
725192c64c28 Merged revisions 67650 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 49136 diff changeset	26 if (buf->shape != NULL)
725192c64c28 Merged revisions 67650 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 49136 diff changeset	27 return buf->shape[0];
50490 26045ed0c26e Merged revisions 68200 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50083 diff changeset	28 if (buf->ndim == 0)
26045ed0c26e Merged revisions 68200 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50083 diff changeset	29 return 1;
26045ed0c26e Merged revisions 68200 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50083 diff changeset	30 PyErr_SetString(PyExc_TypeError,
26045ed0c26e Merged revisions 68200 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50083 diff changeset	31 "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	32 "to it");
26045ed0c26e Merged revisions 68200 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50083 diff changeset	33 return -1;
26045ed0c26e Merged revisions 68200 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50083 diff changeset	34 }
26045ed0c26e Merged revisions 68200 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50083 diff changeset	35
26045ed0c26e Merged revisions 68200 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50083 diff changeset	36 static void
26045ed0c26e Merged revisions 68200 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50083 diff changeset	37 dup_buffer(Py_buffer dest, Py_buffer src)
26045ed0c26e Merged revisions 68200 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50083 diff changeset	38 {
26045ed0c26e Merged revisions 68200 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50083 diff changeset	39 dest = src;
26045ed0c26e Merged revisions 68200 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50083 diff changeset	40 if (src->ndim == 1 && src->shape != NULL) {
26045ed0c26e Merged revisions 68200 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50083 diff changeset	41 dest->shape = &(dest->smalltable[0]);
26045ed0c26e Merged revisions 68200 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50083 diff changeset	42 dest->shape[0] = get_shape0(src);
26045ed0c26e Merged revisions 68200 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50083 diff changeset	43 }
26045ed0c26e Merged revisions 68200 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50083 diff changeset	44 if (src->ndim == 1 && src->strides != NULL) {
26045ed0c26e Merged revisions 68200 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50083 diff changeset	45 dest->strides = &(dest->smalltable[1]);
26045ed0c26e Merged revisions 68200 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50083 diff changeset	46 dest->strides[0] = src->strides[0];
26045ed0c26e Merged revisions 68200 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50083 diff changeset	47 }
50083 725192c64c28 Merged revisions 67650 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 49136 diff changeset	48 }
725192c64c28 Merged revisions 67650 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 49136 diff changeset	49
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	50 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	51 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	52 {
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	53 int res = 0;
64584 ba54096b7a42 Issue #9757: memoryview objects get a release() method to release the Antoine Pitrou <solipsis@pitrou.net> parents: 64361 diff changeset	54 CHECK_RELEASED_INT(self);
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	55 /* 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	56 if (self->view.readonly)
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	57 flags &= ~PyBUF_WRITABLE;
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	58 if (self->view.obj != NULL)
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	59 res = PyObject_GetBuffer(self->view.obj, view, flags);
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	60 if (view)
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	61 dup_buffer(view, &self->view);
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	62 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	63 }
85c22b4d4455 Merged 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	64
85c22b4d4455 Merged 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	65 static void
43439 79b0db0356d3 Whitespace and line lengrth cleanup. Guido van Rossum <guido@python.org> parents: 43423 diff changeset	66 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	67 {
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	68 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	69 }
85c22b4d4455 Merged 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	70
85c22b4d4455 Merged 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	71 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	72 "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	73 \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	74 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	75
85c22b4d4455 Merged 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 PyObject *
48770 7511f3e672a2 #3560: cleanup C memoryview API Antoine Pitrou <solipsis@pitrou.net> parents: 48683 diff changeset	77 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	78 {
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	79 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	80
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	81 mview = (PyMemoryViewObject *)
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	82 PyObject_GC_New(PyMemoryViewObject, &PyMemoryView_Type);
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	83 if (mview == NULL)
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	84 return NULL;
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	85 mview->base = NULL;
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	86 dup_buffer(&mview->view, info);
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	87 /* 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	88 part of PyBuffer_FillInfo(). */
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	89 _PyObject_GC_TRACK(mview);
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	90 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	91 }
85c22b4d4455 Merged 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	92
85c22b4d4455 Merged 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	93 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	94 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	95 {
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	96 PyMemoryViewObject *mview;
58645 cd00a94186c9 Merged revisions 77916 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	97 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	98
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	99 if (!PyObject_CheckBuffer(base)) {
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	100 PyErr_SetString(PyExc_TypeError,
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	101 "cannot make memory view because object does "
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	102 "not have the buffer interface");
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	103 return NULL;
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	104 }
43439 79b0db0356d3 Whitespace and line lengrth cleanup. Guido van Rossum <guido@python.org> parents: 43423 diff changeset	105
58645 cd00a94186c9 Merged revisions 77916 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	106 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	107 return NULL;
43439 79b0db0356d3 Whitespace and line lengrth cleanup. Guido van Rossum <guido@python.org> parents: 43423 diff changeset	108
58645 cd00a94186c9 Merged revisions 77916 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	109 mview = (PyMemoryViewObject *)PyMemoryView_FromBuffer(&view);
cd00a94186c9 Merged revisions 77916 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	110 if (mview == NULL) {
cd00a94186c9 Merged revisions 77916 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55580 diff changeset	111 PyBuffer_Release(&view);
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	112 return NULL;
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	113 }
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
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	115 mview->base = base;
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	116 Py_INCREF(base);
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	117 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	118 }
85c22b4d4455 Merged 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	119
85c22b4d4455 Merged 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 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	121 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	122 {
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	123 PyObject *obj;
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	124 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	125
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	126 if (!PyArg_ParseTupleAndKeywords(args, kwds, "O:memoryview", kwlist,
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	127 &obj)) {
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	128 return NULL;
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	129 }
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	130
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	131 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	132 }
85c22b4d4455 Merged 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	133
85c22b4d4455 Merged 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	134
85c22b4d4455 Merged 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	135 static void
43439 79b0db0356d3 Whitespace and line lengrth cleanup. Guido van Rossum <guido@python.org> parents: 43423 diff changeset	136 _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	137 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	138 {
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	139 int k;
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	140 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	141
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	142 if (nd==0) {
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	143 memcpy(dest, src, itemsize);
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 else if (nd == 1) {
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	146 for (k = 0; k<shape[0]; k++) {
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	147 memcpy(dest, src, itemsize);
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	148 dest += itemsize;
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	149 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	150 }
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	151 }
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	152 else {
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	153 if (fort == 'F') {
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	154 /* Copy first dimension first,
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	155 second dimension second, etc...
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	156 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	157 dimension is actually 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-1;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[nd-1]; 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,
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	165 strides, itemsize, fort);
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	166 dest += outstride;
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	167 src += strides[nd-1];
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	168 }
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	169 }
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	170
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	171 else {
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	172 /* Copy last dimension first,
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	173 second-to-last dimension second, etc.
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	174 Set up the recursion so that the
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	175 first dimension is copied last
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	176 */
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	177 outstride = itemsize;
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	178 for (k=1; k < nd; k++) {
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	179 outstride *= shape[k];
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	180 }
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	181 for (k=0; k<shape[0]; k++) {
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	182 _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	183 strides+1, itemsize,
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	184 fort);
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	185 dest += outstride;
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	186 src += strides[0];
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	187 }
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	188 }
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	189 }
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	190 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	191 }
85c22b4d4455 Merged 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	192
85c22b4d4455 Merged 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	193 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	194 _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	195 {
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	196 Py_ssize_t *indices;
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	197 int k;
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	198 Py_ssize_t elements;
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	199 char *ptr;
64361 7a395bceac91 Fix a compilation warning Antoine Pitrou <solipsis@pitrou.net> parents: 64360 diff changeset	200 void (func)(int, Py_ssize_t , const Py_ssize_t *);
43439 79b0db0356d3 Whitespace and line lengrth cleanup. Guido van Rossum <guido@python.org> parents: 43423 diff changeset	201
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	202 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	203 PyErr_NoMemory();
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	204 return -1;
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	205 }
43439 79b0db0356d3 Whitespace and line lengrth cleanup. Guido van Rossum <guido@python.org> parents: 43423 diff changeset	206
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	207 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	208 if (indices == NULL) {
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	209 PyErr_NoMemory();
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	210 return -1;
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	211 }
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	212 for (k=0; k<view->ndim;k++) {
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	213 indices[k] = 0;
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	214 }
43439 79b0db0356d3 Whitespace and line lengrth cleanup. Guido van Rossum <guido@python.org> parents: 43423 diff changeset	215
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	216 elements = 1;
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	217 for (k=0; k<view->ndim; k++) {
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	218 elements *= view->shape[k];
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	219 }
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	220 if (fort == 'F') {
64343 d24870d00c42 Issue #3101: Helper functions _add_one_to_C() and _add_one_to_F() become Antoine Pitrou <solipsis@pitrou.net> parents: 63924 diff changeset	221 func = _Py_add_one_to_index_F;
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	222 }
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	223 else {
64343 d24870d00c42 Issue #3101: Helper functions _add_one_to_C() and _add_one_to_F() become Antoine Pitrou <solipsis@pitrou.net> parents: 63924 diff changeset	224 func = _Py_add_one_to_index_C;
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	225 }
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	226 while (elements--) {
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	227 func(view->ndim, indices, view->shape);
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	228 ptr = PyBuffer_GetPointer(view, indices);
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	229 memcpy(dest, ptr, view->itemsize);
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	230 dest += view->itemsize;
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	231 }
43439 79b0db0356d3 Whitespace and line lengrth cleanup. Guido van Rossum <guido@python.org> parents: 43423 diff changeset	232
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	233 PyMem_Free(indices);
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	234 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	235 }
85c22b4d4455 Merged 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	236
43439 79b0db0356d3 Whitespace and line lengrth cleanup. Guido van Rossum <guido@python.org> parents: 43423 diff changeset	237 /*
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	238 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	239 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	240 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	241
85c22b4d4455 Merged 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	242 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	243 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	244 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	245 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	246
85c22b4d4455 Merged 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 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	248
85c22b4d4455 Merged 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	249 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	250 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	251 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	252 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	253 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	254 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	255 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	256 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	257 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	258 */
85c22b4d4455 Merged 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
85c22b4d4455 Merged 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	260 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	261 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	262 {
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	263 PyMemoryViewObject *mem;
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	264 PyObject *bytes;
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	265 Py_buffer *view;
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	266 int flags;
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	267 char *dest;
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	268
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	269 if (!PyObject_CheckBuffer(obj)) {
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	270 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	271 "object does not support the buffer interface");
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	272 return NULL;
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	273 }
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	274
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	275 mem = PyObject_GC_New(PyMemoryViewObject, &PyMemoryView_Type);
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	276 if (mem == NULL)
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	277 return NULL;
43439 79b0db0356d3 Whitespace and line lengrth cleanup. Guido van Rossum <guido@python.org> parents: 43423 diff changeset	278
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	279 view = &mem->view;
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	280 flags = PyBUF_FULL_RO;
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	281 switch(buffertype) {
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	282 case PyBUF_WRITE:
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	283 flags = PyBUF_FULL;
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	284 break;
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	285 }
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	286
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	287 if (PyObject_GetBuffer(obj, view, flags) != 0) {
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	288 Py_DECREF(mem);
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	289 return NULL;
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	290 }
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	291
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	292 if (PyBuffer_IsContiguous(view, fort)) {
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	293 /* no copy needed */
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	294 Py_INCREF(obj);
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	295 mem->base = obj;
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	296 _PyObject_GC_TRACK(mem);
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	297 return (PyObject *)mem;
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	298 }
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	299 /* otherwise a copy is needed */
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	300 if (buffertype == PyBUF_WRITE) {
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	301 Py_DECREF(mem);
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	302 PyErr_SetString(PyExc_BufferError,
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	303 "writable contiguous buffer requested "
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	304 "for a non-contiguousobject.");
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	305 return NULL;
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	306 }
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	307 bytes = PyBytes_FromStringAndSize(NULL, view->len);
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	308 if (bytes == NULL) {
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;
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	311 }
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	312 dest = PyBytes_AS_STRING(bytes);
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	313 /* different copying strategy depending on whether
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	314 or not any pointer de-referencing is needed
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	315 */
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	316 /* strided or in-direct copy */
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	317 if (view->suboffsets==NULL) {
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	318 _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	319 view->strides, view->itemsize, fort);
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	320 }
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	321 else {
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	322 if (_indirect_copy_nd(dest, view, fort) < 0) {
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	323 Py_DECREF(bytes);
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	324 Py_DECREF(mem);
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	325 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	326 }
50501 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 if (buffertype == PyBUF_SHADOW) {
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	329 /* return a shadowed memory-view object */
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	330 view->buf = dest;
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	331 mem->base = PyTuple_Pack(2, obj, bytes);
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	332 Py_DECREF(bytes);
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	333 if (mem->base == NULL) {
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	334 Py_DECREF(mem);
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	335 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	336 }
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	337 }
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	338 else {
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	339 PyBuffer_Release(view); /* XXX ? */
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	340 /* steal the reference */
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	341 mem->base = bytes;
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	342 }
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	343 _PyObject_GC_TRACK(mem);
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	344 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	345 }
85c22b4d4455 Merged 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
85c22b4d4455 Merged 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
85c22b4d4455 Merged 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	348 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	349 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	350 {
64584 ba54096b7a42 Issue #9757: memoryview objects get a release() method to release the Antoine Pitrou <solipsis@pitrou.net> parents: 64361 diff changeset	351 CHECK_RELEASED(self);
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	352 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	353 }
85c22b4d4455 Merged 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	354
85c22b4d4455 Merged 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	355 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	356 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	357 {
64584 ba54096b7a42 Issue #9757: memoryview objects get a release() method to release the Antoine Pitrou <solipsis@pitrou.net> parents: 64361 diff changeset	358 CHECK_RELEASED(self);
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	359 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	360 }
85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: diff changeset	361
85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: diff changeset	362 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	363 _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	364 {
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	365 int i;
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	366 PyObject *o;
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	367 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	368
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	369 if (vals == NULL) {
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	370 Py_INCREF(Py_None);
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	371 return Py_None;
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	372 }
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	373 intTuple = PyTuple_New(len);
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	374 if (!intTuple) return NULL;
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	375 for(i=0; i<len; i++) {
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	376 o = PyLong_FromSsize_t(vals[i]);
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	377 if (!o) {
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	378 Py_DECREF(intTuple);
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	379 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	380 }
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	381 PyTuple_SET_ITEM(intTuple, i, o);
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	382 }
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	383 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	384 }
85c22b4d4455 Merged 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 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	387 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	388 {
64584 ba54096b7a42 Issue #9757: memoryview objects get a release() method to release the Antoine Pitrou <solipsis@pitrou.net> parents: 64361 diff changeset	389 CHECK_RELEASED(self);
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	390 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	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_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	395 {
64584 ba54096b7a42 Issue #9757: memoryview objects get a release() method to release the Antoine Pitrou <solipsis@pitrou.net> parents: 64361 diff changeset	396 CHECK_RELEASED(self);
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	397 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	398 }
85c22b4d4455 Merged 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	399
85c22b4d4455 Merged 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	400 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	401 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	402 {
64584 ba54096b7a42 Issue #9757: memoryview objects get a release() method to release the Antoine Pitrou <solipsis@pitrou.net> parents: 64361 diff changeset	403 CHECK_RELEASED(self);
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	404 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	405 }
85c22b4d4455 Merged 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	406
85c22b4d4455 Merged 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	407 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	408 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	409 {
64584 ba54096b7a42 Issue #9757: memoryview objects get a release() method to release the Antoine Pitrou <solipsis@pitrou.net> parents: 64361 diff changeset	410 CHECK_RELEASED(self);
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	411 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	412 }
85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: diff changeset	413
85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: diff changeset	414 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	415 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	416 {
64584 ba54096b7a42 Issue #9757: memoryview objects get a release() method to release the Antoine Pitrou <solipsis@pitrou.net> parents: 64361 diff changeset	417 CHECK_RELEASED(self);
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	418 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	419 }
85c22b4d4455 Merged 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	420
43439 79b0db0356d3 Whitespace and line lengrth cleanup. Guido van Rossum <guido@python.org> parents: 43423 diff changeset	421 static PyGetSetDef memory_getsetlist[] ={
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	422 {"format", (getter)memory_format_get, NULL, NULL},
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	423 {"itemsize", (getter)memory_itemsize_get, NULL, NULL},
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	424 {"shape", (getter)memory_shape_get, NULL, NULL},
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	425 {"strides", (getter)memory_strides_get, NULL, NULL},
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	426 {"suboffsets", (getter)memory_suboffsets_get, NULL, NULL},
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	427 {"readonly", (getter)memory_readonly_get, NULL, NULL},
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	428 {"ndim", (getter)memory_ndim_get, NULL, NULL},
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	429 {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	430 };
85c22b4d4455 Merged 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	431
85c22b4d4455 Merged 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	432
85c22b4d4455 Merged 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	433 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	434 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	435 {
64584 ba54096b7a42 Issue #9757: memoryview objects get a release() method to release the Antoine Pitrou <solipsis@pitrou.net> parents: 64361 diff changeset	436 CHECK_RELEASED(mem);
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	437 return PyObject_CallFunctionObjArgs(
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	438 (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	439 }
85c22b4d4455 Merged 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	440
48782 501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	441 /* 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	442 each buffer item */
501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	443
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	444 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	445 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	446 {
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	447 Py_buffer *view = &(mem->view);
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	448 Py_ssize_t i;
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	449 PyObject res, item;
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	450 char *buf;
48782 501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	451
64584 ba54096b7a42 Issue #9757: memoryview objects get a release() method to release the Antoine Pitrou <solipsis@pitrou.net> parents: 64361 diff changeset	452 CHECK_RELEASED(mem);
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	453 if (strcmp(view->format, "B") \|\| view->itemsize != 1) {
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	454 PyErr_SetString(PyExc_NotImplementedError,
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	455 "tolist() only supports byte views");
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	456 return NULL;
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	457 }
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	458 if (view->ndim != 1) {
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	459 PyErr_SetString(PyExc_NotImplementedError,
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	460 "tolist() only supports one-dimensional objects");
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	461 return NULL;
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	462 }
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	463 res = PyList_New(view->len);
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	464 if (res == NULL)
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	465 return NULL;
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	466 buf = view->buf;
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	467 for (i = 0; i < view->len; i++) {
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	468 item = PyLong_FromUnsignedLong((unsigned char) *buf);
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	469 if (item == NULL) {
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	470 Py_DECREF(res);
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	471 return NULL;
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	472 }
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	473 PyList_SET_ITEM(res, i, item);
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	474 buf++;
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	475 }
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	476 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	477 }
85c22b4d4455 Merged 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	478
85c22b4d4455 Merged 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	479 static void
64584 ba54096b7a42 Issue #9757: memoryview objects get a release() method to release the Antoine Pitrou <solipsis@pitrou.net> parents: 64361 diff changeset	480 do_release(PyMemoryViewObject *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	481 {
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	482 if (self->view.obj != NULL) {
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	483 if (self->base && PyTuple_Check(self->base)) {
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	484 /* Special case when first element is generic object
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	485 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	486 contiguous "shadow" that must be copied back into
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	487 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	488 releasing the buffer on the first element.
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	489 */
43439 79b0db0356d3 Whitespace and line lengrth cleanup. Guido van Rossum <guido@python.org> parents: 43423 diff changeset	490
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	491 PyObject_CopyData(PyTuple_GET_ITEM(self->base,0),
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	492 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	493
50490 26045ed0c26e Merged revisions 68200 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50083 diff changeset	494 /* The view member should have readonly == -1 in
26045ed0c26e Merged revisions 68200 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50083 diff changeset	495 this instance indicating that the memory can
26045ed0c26e Merged revisions 68200 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50083 diff changeset	496 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	497 again after this call.
26045ed0c26e Merged revisions 68200 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50083 diff changeset	498 */
26045ed0c26e Merged revisions 68200 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50083 diff changeset	499 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	500 }
50490 26045ed0c26e Merged revisions 68200 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50083 diff changeset	501 else {
26045ed0c26e Merged revisions 68200 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50083 diff changeset	502 PyBuffer_Release(&(self->view));
26045ed0c26e Merged revisions 68200 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50083 diff changeset	503 }
26045ed0c26e Merged revisions 68200 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50083 diff changeset	504 Py_CLEAR(self->base);
26045ed0c26e Merged revisions 68200 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50083 diff changeset	505 }
64584 ba54096b7a42 Issue #9757: memoryview objects get a release() method to release the Antoine Pitrou <solipsis@pitrou.net> parents: 64361 diff changeset	506 self->view.obj = NULL;
ba54096b7a42 Issue #9757: memoryview objects get a release() method to release the Antoine Pitrou <solipsis@pitrou.net> parents: 64361 diff changeset	507 self->view.buf = NULL;
ba54096b7a42 Issue #9757: memoryview objects get a release() method to release the Antoine Pitrou <solipsis@pitrou.net> parents: 64361 diff changeset	508 }
ba54096b7a42 Issue #9757: memoryview objects get a release() method to release the Antoine Pitrou <solipsis@pitrou.net> parents: 64361 diff changeset	509
ba54096b7a42 Issue #9757: memoryview objects get a release() method to release the Antoine Pitrou <solipsis@pitrou.net> parents: 64361 diff changeset	510 static PyObject *
ba54096b7a42 Issue #9757: memoryview objects get a release() method to release the Antoine Pitrou <solipsis@pitrou.net> parents: 64361 diff changeset	511 memory_enter(PyObject self, PyObject args)
ba54096b7a42 Issue #9757: memoryview objects get a release() method to release the Antoine Pitrou <solipsis@pitrou.net> parents: 64361 diff changeset	512 {
ba54096b7a42 Issue #9757: memoryview objects get a release() method to release the Antoine Pitrou <solipsis@pitrou.net> parents: 64361 diff changeset	513 CHECK_RELEASED(self);
ba54096b7a42 Issue #9757: memoryview objects get a release() method to release the Antoine Pitrou <solipsis@pitrou.net> parents: 64361 diff changeset	514 Py_INCREF(self);
ba54096b7a42 Issue #9757: memoryview objects get a release() method to release the Antoine Pitrou <solipsis@pitrou.net> parents: 64361 diff changeset	515 return self;
ba54096b7a42 Issue #9757: memoryview objects get a release() method to release the Antoine Pitrou <solipsis@pitrou.net> parents: 64361 diff changeset	516 }
ba54096b7a42 Issue #9757: memoryview objects get a release() method to release the Antoine Pitrou <solipsis@pitrou.net> parents: 64361 diff changeset	517
ba54096b7a42 Issue #9757: memoryview objects get a release() method to release the Antoine Pitrou <solipsis@pitrou.net> parents: 64361 diff changeset	518 static PyObject *
ba54096b7a42 Issue #9757: memoryview objects get a release() method to release the Antoine Pitrou <solipsis@pitrou.net> parents: 64361 diff changeset	519 memory_exit(PyObject self, PyObject args)
ba54096b7a42 Issue #9757: memoryview objects get a release() method to release the Antoine Pitrou <solipsis@pitrou.net> parents: 64361 diff changeset	520 {
ba54096b7a42 Issue #9757: memoryview objects get a release() method to release the Antoine Pitrou <solipsis@pitrou.net> parents: 64361 diff changeset	521 do_release((PyMemoryViewObject *) self);
ba54096b7a42 Issue #9757: memoryview objects get a release() method to release the Antoine Pitrou <solipsis@pitrou.net> parents: 64361 diff changeset	522 Py_RETURN_NONE;
ba54096b7a42 Issue #9757: memoryview objects get a release() method to release the Antoine Pitrou <solipsis@pitrou.net> parents: 64361 diff changeset	523 }
ba54096b7a42 Issue #9757: memoryview objects get a release() method to release the Antoine Pitrou <solipsis@pitrou.net> parents: 64361 diff changeset	524
ba54096b7a42 Issue #9757: memoryview objects get a release() method to release the Antoine Pitrou <solipsis@pitrou.net> parents: 64361 diff changeset	525 static PyMethodDef memory_methods[] = {
ba54096b7a42 Issue #9757: memoryview objects get a release() method to release the Antoine Pitrou <solipsis@pitrou.net> parents: 64361 diff changeset	526 {"release", memory_exit, METH_NOARGS},
ba54096b7a42 Issue #9757: memoryview objects get a release() method to release the Antoine Pitrou <solipsis@pitrou.net> parents: 64361 diff changeset	527 {"tobytes", (PyCFunction)memory_tobytes, METH_NOARGS, NULL},
ba54096b7a42 Issue #9757: memoryview objects get a release() method to release the Antoine Pitrou <solipsis@pitrou.net> parents: 64361 diff changeset	528 {"tolist", (PyCFunction)memory_tolist, METH_NOARGS, NULL},
ba54096b7a42 Issue #9757: memoryview objects get a release() method to release the Antoine Pitrou <solipsis@pitrou.net> parents: 64361 diff changeset	529 {"__enter__", memory_enter, METH_NOARGS},
ba54096b7a42 Issue #9757: memoryview objects get a release() method to release the Antoine Pitrou <solipsis@pitrou.net> parents: 64361 diff changeset	530 {"__exit__", memory_exit, METH_VARARGS},
ba54096b7a42 Issue #9757: memoryview objects get a release() method to release the Antoine Pitrou <solipsis@pitrou.net> parents: 64361 diff changeset	531 {NULL, NULL} /* sentinel */
ba54096b7a42 Issue #9757: memoryview objects get a release() method to release the Antoine Pitrou <solipsis@pitrou.net> parents: 64361 diff changeset	532 };
ba54096b7a42 Issue #9757: memoryview objects get a release() method to release the Antoine Pitrou <solipsis@pitrou.net> parents: 64361 diff changeset	533
ba54096b7a42 Issue #9757: memoryview objects get a release() method to release the Antoine Pitrou <solipsis@pitrou.net> parents: 64361 diff changeset	534
ba54096b7a42 Issue #9757: memoryview objects get a release() method to release the Antoine Pitrou <solipsis@pitrou.net> parents: 64361 diff changeset	535 static void
ba54096b7a42 Issue #9757: memoryview objects get a release() method to release the Antoine Pitrou <solipsis@pitrou.net> parents: 64361 diff changeset	536 memory_dealloc(PyMemoryViewObject *self)
ba54096b7a42 Issue #9757: memoryview objects get a release() method to release the Antoine Pitrou <solipsis@pitrou.net> parents: 64361 diff changeset	537 {
ba54096b7a42 Issue #9757: memoryview objects get a release() method to release the Antoine Pitrou <solipsis@pitrou.net> parents: 64361 diff changeset	538 _PyObject_GC_UNTRACK(self);
ba54096b7a42 Issue #9757: memoryview objects get a release() method to release the Antoine Pitrou <solipsis@pitrou.net> parents: 64361 diff changeset	539 do_release(self);
50490 26045ed0c26e Merged revisions 68200 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50083 diff changeset	540 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	541 }
85c22b4d4455 Merged 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	542
85c22b4d4455 Merged 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	543 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	544 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	545 {
64584 ba54096b7a42 Issue #9757: memoryview objects get a release() method to release the Antoine Pitrou <solipsis@pitrou.net> parents: 64361 diff changeset	546 if (IS_RELEASED(self))
ba54096b7a42 Issue #9757: memoryview objects get a release() method to release the Antoine Pitrou <solipsis@pitrou.net> parents: 64361 diff changeset	547 return PyUnicode_FromFormat("<released memory at %p>", self);
ba54096b7a42 Issue #9757: memoryview objects get a release() method to release the Antoine Pitrou <solipsis@pitrou.net> parents: 64361 diff changeset	548 else
ba54096b7a42 Issue #9757: memoryview objects get a release() method to release the Antoine Pitrou <solipsis@pitrou.net> parents: 64361 diff changeset	549 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	550 }
85c22b4d4455 Merged 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	551
85c22b4d4455 Merged 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	552 /* 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	553 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	554 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	555 {
64584 ba54096b7a42 Issue #9757: memoryview objects get a release() method to release the Antoine Pitrou <solipsis@pitrou.net> parents: 64361 diff changeset	556 CHECK_RELEASED_INT(self);
50490 26045ed0c26e Merged revisions 68200 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50083 diff changeset	557 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	558 }
85c22b4d4455 Merged 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
54828 b4d0c020e357 Issue 6329: Fix iteration for memoryviews. Raymond Hettinger <python@rcn.com> parents: 51468 diff changeset	560 /* 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	561 Used by PySeqIter_New().
b4d0c020e357 Issue 6329: Fix iteration for memoryviews. Raymond Hettinger <python@rcn.com> parents: 51468 diff changeset	562 */
b4d0c020e357 Issue 6329: Fix iteration for memoryviews. Raymond Hettinger <python@rcn.com> parents: 51468 diff changeset	563 static PyObject *
b4d0c020e357 Issue 6329: Fix iteration for memoryviews. Raymond Hettinger <python@rcn.com> parents: 51468 diff changeset	564 memory_item(PyMemoryViewObject *self, Py_ssize_t result)
b4d0c020e357 Issue 6329: Fix iteration for memoryviews. Raymond Hettinger <python@rcn.com> parents: 51468 diff changeset	565 {
b4d0c020e357 Issue 6329: Fix iteration for memoryviews. Raymond Hettinger <python@rcn.com> parents: 51468 diff changeset	566 Py_buffer *view = &(self->view);
b4d0c020e357 Issue 6329: Fix iteration for memoryviews. Raymond Hettinger <python@rcn.com> parents: 51468 diff changeset	567
64584 ba54096b7a42 Issue #9757: memoryview objects get a release() method to release the Antoine Pitrou <solipsis@pitrou.net> parents: 64361 diff changeset	568 CHECK_RELEASED(self);
54828 b4d0c020e357 Issue 6329: Fix iteration for memoryviews. Raymond Hettinger <python@rcn.com> parents: 51468 diff changeset	569 if (view->ndim == 0) {
b4d0c020e357 Issue 6329: Fix iteration for memoryviews. Raymond Hettinger <python@rcn.com> parents: 51468 diff changeset	570 PyErr_SetString(PyExc_IndexError,
b4d0c020e357 Issue 6329: Fix iteration for memoryviews. Raymond Hettinger <python@rcn.com> parents: 51468 diff changeset	571 "invalid indexing of 0-dim memory");
b4d0c020e357 Issue 6329: Fix iteration for memoryviews. Raymond Hettinger <python@rcn.com> parents: 51468 diff changeset	572 return NULL;
b4d0c020e357 Issue 6329: Fix iteration for memoryviews. Raymond Hettinger <python@rcn.com> parents: 51468 diff changeset	573 }
b4d0c020e357 Issue 6329: Fix iteration for memoryviews. Raymond Hettinger <python@rcn.com> parents: 51468 diff changeset	574 if (view->ndim == 1) {
b4d0c020e357 Issue 6329: Fix iteration for memoryviews. Raymond Hettinger <python@rcn.com> parents: 51468 diff changeset	575 /* Return a bytes object */
b4d0c020e357 Issue 6329: Fix iteration for memoryviews. Raymond Hettinger <python@rcn.com> parents: 51468 diff changeset	576 char *ptr;
b4d0c020e357 Issue 6329: Fix iteration for memoryviews. Raymond Hettinger <python@rcn.com> parents: 51468 diff changeset	577 ptr = (char *)view->buf;
b4d0c020e357 Issue 6329: Fix iteration for memoryviews. Raymond Hettinger <python@rcn.com> parents: 51468 diff changeset	578 if (result < 0) {
b4d0c020e357 Issue 6329: Fix iteration for memoryviews. Raymond Hettinger <python@rcn.com> parents: 51468 diff changeset	579 result += get_shape0(view);
b4d0c020e357 Issue 6329: Fix iteration for memoryviews. Raymond Hettinger <python@rcn.com> parents: 51468 diff changeset	580 }
b4d0c020e357 Issue 6329: Fix iteration for memoryviews. Raymond Hettinger <python@rcn.com> parents: 51468 diff changeset	581 if ((result < 0) \|\| (result >= get_shape0(view))) {
b4d0c020e357 Issue 6329: Fix iteration for memoryviews. Raymond Hettinger <python@rcn.com> parents: 51468 diff changeset	582 PyErr_SetString(PyExc_IndexError,
b4d0c020e357 Issue 6329: Fix iteration for memoryviews. Raymond Hettinger <python@rcn.com> parents: 51468 diff changeset	583 "index out of bounds");
b4d0c020e357 Issue 6329: Fix iteration for memoryviews. Raymond Hettinger <python@rcn.com> parents: 51468 diff changeset	584 return NULL;
b4d0c020e357 Issue 6329: Fix iteration for memoryviews. Raymond Hettinger <python@rcn.com> parents: 51468 diff changeset	585 }
b4d0c020e357 Issue 6329: Fix iteration for memoryviews. Raymond Hettinger <python@rcn.com> parents: 51468 diff changeset	586 if (view->strides == NULL)
b4d0c020e357 Issue 6329: Fix iteration for memoryviews. Raymond Hettinger <python@rcn.com> parents: 51468 diff changeset	587 ptr += view->itemsize * result;
b4d0c020e357 Issue 6329: Fix iteration for memoryviews. Raymond Hettinger <python@rcn.com> parents: 51468 diff changeset	588 else
b4d0c020e357 Issue 6329: Fix iteration for memoryviews. Raymond Hettinger <python@rcn.com> parents: 51468 diff changeset	589 ptr += view->strides[0] * result;
b4d0c020e357 Issue 6329: Fix iteration for memoryviews. Raymond Hettinger <python@rcn.com> parents: 51468 diff changeset	590 if (view->suboffsets != NULL &&
b4d0c020e357 Issue 6329: Fix iteration for memoryviews. Raymond Hettinger <python@rcn.com> parents: 51468 diff changeset	591 view->suboffsets[0] >= 0) {
b4d0c020e357 Issue 6329: Fix iteration for memoryviews. Raymond Hettinger <python@rcn.com> parents: 51468 diff changeset	592 ptr = ((char *)ptr) + view->suboffsets[0];
b4d0c020e357 Issue 6329: Fix iteration for memoryviews. Raymond Hettinger <python@rcn.com> parents: 51468 diff changeset	593 }
b4d0c020e357 Issue 6329: Fix iteration for memoryviews. Raymond Hettinger <python@rcn.com> parents: 51468 diff changeset	594 return PyBytes_FromStringAndSize(ptr, view->itemsize);
b4d0c020e357 Issue 6329: Fix iteration for memoryviews. Raymond Hettinger <python@rcn.com> parents: 51468 diff changeset	595 } else {
b4d0c020e357 Issue 6329: Fix iteration for memoryviews. Raymond Hettinger <python@rcn.com> parents: 51468 diff changeset	596 /* Return a new memory-view object */
b4d0c020e357 Issue 6329: Fix iteration for memoryviews. Raymond Hettinger <python@rcn.com> parents: 51468 diff changeset	597 Py_buffer newview;
b4d0c020e357 Issue 6329: Fix iteration for memoryviews. Raymond Hettinger <python@rcn.com> parents: 51468 diff changeset	598 memset(&newview, 0, sizeof(newview));
b4d0c020e357 Issue 6329: Fix iteration for memoryviews. Raymond Hettinger <python@rcn.com> parents: 51468 diff changeset	599 /* 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	600 return PyMemoryView_FromBuffer(&newview);
b4d0c020e357 Issue 6329: Fix iteration for memoryviews. Raymond Hettinger <python@rcn.com> parents: 51468 diff changeset	601 }
b4d0c020e357 Issue 6329: Fix iteration for memoryviews. Raymond Hettinger <python@rcn.com> parents: 51468 diff changeset	602 }
b4d0c020e357 Issue 6329: Fix iteration for memoryviews. Raymond Hettinger <python@rcn.com> parents: 51468 diff changeset	603
43439 79b0db0356d3 Whitespace and line lengrth cleanup. Guido van Rossum <guido@python.org> parents: 43423 diff changeset	604 /*
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	605 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	606 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	607 if it does not.
43439 79b0db0356d3 Whitespace and line lengrth cleanup. Guido van Rossum <guido@python.org> parents: 43423 diff changeset	608
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	609 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	610 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	611 */
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	612 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	613 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	614 {
50083 725192c64c28 Merged revisions 67650 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 49136 diff changeset	615 Py_buffer *view;
725192c64c28 Merged revisions 67650 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 49136 diff changeset	616 view = &(self->view);
725192c64c28 Merged revisions 67650 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 49136 diff changeset	617
64584 ba54096b7a42 Issue #9757: memoryview objects get a release() method to release the Antoine Pitrou <solipsis@pitrou.net> parents: 64361 diff changeset	618 CHECK_RELEASED(self);
50083 725192c64c28 Merged revisions 67650 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 49136 diff changeset	619 if (view->ndim == 0) {
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	620 if (key == Py_Ellipsis \|\|
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	621 (PyTuple_Check(key) && PyTuple_GET_SIZE(key)==0)) {
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	622 Py_INCREF(self);
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	623 return (PyObject *)self;
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	624 }
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	625 else {
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	626 PyErr_SetString(PyExc_IndexError,
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	627 "invalid indexing of 0-dim memory");
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	628 return NULL;
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	629 }
50083 725192c64c28 Merged revisions 67650 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 49136 diff changeset	630 }
725192c64c28 Merged revisions 67650 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 49136 diff changeset	631 if (PyIndex_Check(key)) {
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	632 Py_ssize_t result;
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	633 result = PyNumber_AsSsize_t(key, NULL);
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	634 if (result == -1 && PyErr_Occurred())
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	635 return NULL;
54828 b4d0c020e357 Issue 6329: Fix iteration for memoryviews. Raymond Hettinger <python@rcn.com> parents: 51468 diff changeset	636 return memory_item(self, result);
50083 725192c64c28 Merged revisions 67650 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 49136 diff changeset	637 }
725192c64c28 Merged revisions 67650 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 49136 diff changeset	638 else if (PySlice_Check(key)) {
50490 26045ed0c26e Merged revisions 68200 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50083 diff changeset	639 Py_ssize_t start, stop, step, slicelength;
26045ed0c26e Merged revisions 68200 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50083 diff changeset	640
50083 725192c64c28 Merged revisions 67650 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 49136 diff changeset	641 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	642 &start, &stop, &step, &slicelength) < 0) {
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	643 return NULL;
50490 26045ed0c26e Merged revisions 68200 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50083 diff changeset	644 }
50083 725192c64c28 Merged revisions 67650 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 49136 diff changeset	645
50490 26045ed0c26e Merged revisions 68200 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50083 diff changeset	646 if (step == 1 && view->ndim == 1) {
26045ed0c26e Merged revisions 68200 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50083 diff changeset	647 Py_buffer newview;
26045ed0c26e Merged revisions 68200 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50083 diff changeset	648 void newbuf = (char ) view->buf
26045ed0c26e Merged revisions 68200 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50083 diff changeset	649 + start * view->itemsize;
26045ed0c26e Merged revisions 68200 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50083 diff changeset	650 int newflags = view->readonly
26045ed0c26e Merged revisions 68200 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50083 diff changeset	651 ? PyBUF_CONTIG_RO : PyBUF_CONTIG;
50083 725192c64c28 Merged revisions 67650 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 49136 diff changeset	652
50490 26045ed0c26e Merged revisions 68200 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50083 diff changeset	653 /* 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	654 if (view->obj != NULL) {
26045ed0c26e Merged revisions 68200 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50083 diff changeset	655 if (PyObject_GetBuffer(view->obj, &newview, newflags) == -1)
26045ed0c26e Merged revisions 68200 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50083 diff changeset	656 return NULL;
26045ed0c26e Merged revisions 68200 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50083 diff changeset	657 }
26045ed0c26e Merged revisions 68200 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50083 diff changeset	658 else {
26045ed0c26e Merged revisions 68200 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50083 diff changeset	659 newview = *view;
26045ed0c26e Merged revisions 68200 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50083 diff changeset	660 }
26045ed0c26e Merged revisions 68200 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50083 diff changeset	661 newview.buf = newbuf;
26045ed0c26e Merged revisions 68200 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50083 diff changeset	662 newview.len = slicelength * newview.itemsize;
26045ed0c26e Merged revisions 68200 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50083 diff changeset	663 newview.format = view->format;
26045ed0c26e Merged revisions 68200 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50083 diff changeset	664 newview.shape = &(newview.smalltable[0]);
26045ed0c26e Merged revisions 68200 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50083 diff changeset	665 newview.shape[0] = slicelength;
26045ed0c26e Merged revisions 68200 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50083 diff changeset	666 newview.strides = &(newview.itemsize);
26045ed0c26e Merged revisions 68200 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50083 diff changeset	667 return PyMemoryView_FromBuffer(&newview);
26045ed0c26e Merged revisions 68200 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50083 diff changeset	668 }
26045ed0c26e Merged revisions 68200 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50083 diff changeset	669 PyErr_SetNone(PyExc_NotImplementedError);
26045ed0c26e Merged revisions 68200 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50083 diff changeset	670 return NULL;
50083 725192c64c28 Merged revisions 67650 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 49136 diff changeset	671 }
725192c64c28 Merged revisions 67650 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 49136 diff changeset	672 PyErr_Format(PyExc_TypeError,
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	673 "cannot index memory using \"%.200s\"",
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	674 key->ob_type->tp_name);
50083 725192c64c28 Merged revisions 67650 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 49136 diff changeset	675 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	676 }
85c22b4d4455 Merged 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	677
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	678
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	679 /* 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	680 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	681 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	682 {
62964 189fa92d15dc Issue #7616: Fix copying of overlapping memoryview slices with the Intel Antoine Pitrou <solipsis@pitrou.net> parents: 58645 diff changeset	683 Py_ssize_t start, len, bytelen;
48782 501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	684 Py_buffer srcview;
501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	685 Py_buffer *view = &(self->view);
501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	686 char srcbuf, destbuf;
501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	687
64584 ba54096b7a42 Issue #9757: memoryview objects get a release() method to release the Antoine Pitrou <solipsis@pitrou.net> parents: 64361 diff changeset	688 CHECK_RELEASED_INT(self);
48782 501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	689 if (view->readonly) {
501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	690 PyErr_SetString(PyExc_TypeError,
501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	691 "cannot modify read-only memory");
501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	692 return -1;
501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	693 }
64360 925e9113f0aa Issue #9737: Fix a crash when trying to delete a slice or an item from Antoine Pitrou <solipsis@pitrou.net> parents: 64343 diff changeset	694 if (value == NULL) {
925e9113f0aa Issue #9737: Fix a crash when trying to delete a slice or an item from Antoine Pitrou <solipsis@pitrou.net> parents: 64343 diff changeset	695 PyErr_SetString(PyExc_TypeError,
925e9113f0aa Issue #9737: Fix a crash when trying to delete a slice or an item from Antoine Pitrou <solipsis@pitrou.net> parents: 64343 diff changeset	696 "cannot delete memory");
925e9113f0aa Issue #9737: Fix a crash when trying to delete a slice or an item from Antoine Pitrou <solipsis@pitrou.net> parents: 64343 diff changeset	697 return -1;
925e9113f0aa Issue #9737: Fix a crash when trying to delete a slice or an item from Antoine Pitrou <solipsis@pitrou.net> parents: 64343 diff changeset	698 }
48782 501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	699 if (view->ndim != 1) {
501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	700 PyErr_SetNone(PyExc_NotImplementedError);
501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	701 return -1;
501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	702 }
501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	703 if (PyIndex_Check(key)) {
501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	704 start = PyNumber_AsSsize_t(key, NULL);
501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	705 if (start == -1 && PyErr_Occurred())
501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	706 return -1;
501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	707 if (start < 0) {
50083 725192c64c28 Merged revisions 67650 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 49136 diff changeset	708 start += get_shape0(view);
48782 501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	709 }
50083 725192c64c28 Merged revisions 67650 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 49136 diff changeset	710 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	711 PyErr_SetString(PyExc_IndexError,
501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	712 "index out of bounds");
501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	713 return -1;
501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	714 }
501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	715 len = 1;
501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	716 }
501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	717 else if (PySlice_Check(key)) {
501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	718 Py_ssize_t stop, step;
501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	719
50083 725192c64c28 Merged revisions 67650 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 49136 diff changeset	720 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	721 &start, &stop, &step, &len) < 0) {
501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	722 return -1;
501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	723 }
501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	724 if (step != 1) {
501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	725 PyErr_SetNone(PyExc_NotImplementedError);
501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	726 return -1;
501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	727 }
501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	728 }
501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	729 else {
501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	730 PyErr_Format(PyExc_TypeError,
501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	731 "cannot index memory using \"%.200s\"",
501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	732 key->ob_type->tp_name);
501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	733 return -1;
501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	734 }
501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	735 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	736 return -1;
501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	737 }
501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	738 /* 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	739 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	740 (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	741 if (srcview.itemsize != view->itemsize) {
501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	742 PyErr_Format(PyExc_TypeError,
501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	743 "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	744 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	745 goto _error;
501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	746 }
50083 725192c64c28 Merged revisions 67650 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 49136 diff changeset	747 bytelen = len * view->itemsize;
725192c64c28 Merged revisions 67650 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 49136 diff changeset	748 if (bytelen != srcview.len) {
48782 501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	749 PyErr_SetString(PyExc_ValueError,
501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	750 "cannot modify size of memoryview object");
501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	751 goto _error;
501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	752 }
501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	753 /* Do the actual copy */
501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	754 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	755 srcbuf = (char *) srcview.buf;
501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	756 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	757 /* No overlapping */
501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	758 memcpy(destbuf, srcbuf, bytelen);
62964 189fa92d15dc Issue #7616: Fix copying of overlapping memoryview slices with the Intel Antoine Pitrou <solipsis@pitrou.net> parents: 58645 diff changeset	759 else
189fa92d15dc Issue #7616: Fix copying of overlapping memoryview slices with the Intel Antoine Pitrou <solipsis@pitrou.net> parents: 58645 diff changeset	760 memmove(destbuf, srcbuf, bytelen);
48782 501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	761
501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	762 PyBuffer_Release(&srcview);
501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	763 return 0;
501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	764
501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	765 _error:
501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	766 PyBuffer_Release(&srcview);
501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	767 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	768 }
85c22b4d4455 Merged 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	769
48782 501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	770 static PyObject *
501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	771 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	772 {
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	773 Py_buffer vv, ww;
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	774 int equal = 0;
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	775 PyObject *res;
48782 501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	776
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	777 vv.obj = NULL;
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	778 ww.obj = NULL;
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	779 if (op != Py_EQ && op != Py_NE)
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	780 goto _notimpl;
64584 ba54096b7a42 Issue #9757: memoryview objects get a release() method to release the Antoine Pitrou <solipsis@pitrou.net> parents: 64361 diff changeset	781 if ((PyMemoryView_Check(v) && IS_RELEASED(v)) \|\|
ba54096b7a42 Issue #9757: memoryview objects get a release() method to release the Antoine Pitrou <solipsis@pitrou.net> parents: 64361 diff changeset	782 (PyMemoryView_Check(w) && IS_RELEASED(w))) {
ba54096b7a42 Issue #9757: memoryview objects get a release() method to release the Antoine Pitrou <solipsis@pitrou.net> parents: 64361 diff changeset	783 equal = (v == w);
ba54096b7a42 Issue #9757: memoryview objects get a release() method to release the Antoine Pitrou <solipsis@pitrou.net> parents: 64361 diff changeset	784 goto _end;
ba54096b7a42 Issue #9757: memoryview objects get a release() method to release the Antoine Pitrou <solipsis@pitrou.net> parents: 64361 diff changeset	785 }
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	786 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	787 PyErr_Clear();
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	788 goto _notimpl;
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	789 }
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	790 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	791 PyErr_Clear();
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	792 goto _notimpl;
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	793 }
48782 501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	794
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	795 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	796 goto _end;
48782 501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	797
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	798 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	799
501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	800 _end:
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	801 PyBuffer_Release(&vv);
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	802 PyBuffer_Release(&ww);
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	803 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	804 res = Py_True;
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	805 else
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	806 res = Py_False;
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	807 Py_INCREF(res);
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	808 return res;
48782 501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	809
501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	810 _notimpl:
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	811 PyBuffer_Release(&vv);
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	812 PyBuffer_Release(&ww);
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	813 Py_INCREF(Py_NotImplemented);
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	814 return Py_NotImplemented;
48782 501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	815 }
501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	816
501256c54c84 Issue #2394: implement more of the memoryview API. Antoine Pitrou <solipsis@pitrou.net> parents: 48770 diff changeset	817
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	818 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	819 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	820 {
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	821 if (self->base != NULL)
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	822 Py_VISIT(self->base);
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	823 if (self->view.obj != NULL)
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	824 Py_VISIT(self->view.obj);
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	825 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	826 }
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	827
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	828 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	829 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	830 {
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	831 Py_CLEAR(self->base);
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	832 PyBuffer_Release(&self->view);
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	833 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	834 }
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	835
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	836
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	837 /* 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	838 static PyMappingMethods memory_as_mapping = {
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	839 (lenfunc)memory_length, /* mp_length */
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	840 (binaryfunc)memory_subscript, /* mp_subscript */
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	841 (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	842 };
85c22b4d4455 Merged 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	843
54828 b4d0c020e357 Issue 6329: Fix iteration for memoryviews. Raymond Hettinger <python@rcn.com> parents: 51468 diff changeset	844 static PySequenceMethods memory_as_sequence = {
63924 9108e7dcd7d8 Issue #2443: Added a new macro, Py_VA_COPY, which is equivalent to C99 Alexander Belopolsky <alexander.belopolsky@gmail.com> parents: 62964 diff changeset	845 0, /* sq_length */
9108e7dcd7d8 Issue #2443: Added a new macro, Py_VA_COPY, which is equivalent to C99 Alexander Belopolsky <alexander.belopolsky@gmail.com> parents: 62964 diff changeset	846 0, /* sq_concat */
9108e7dcd7d8 Issue #2443: Added a new macro, Py_VA_COPY, which is equivalent to C99 Alexander Belopolsky <alexander.belopolsky@gmail.com> parents: 62964 diff changeset	847 0, /* sq_repeat */
9108e7dcd7d8 Issue #2443: Added a new macro, Py_VA_COPY, which is equivalent to C99 Alexander Belopolsky <alexander.belopolsky@gmail.com> parents: 62964 diff changeset	848 (ssizeargfunc)memory_item, /* sq_item */
54828 b4d0c020e357 Issue 6329: Fix iteration for memoryviews. Raymond Hettinger <python@rcn.com> parents: 51468 diff changeset	849 };
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	850
85c22b4d4455 Merged 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	851 /* 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	852
85c22b4d4455 Merged 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	853 static PyBufferProcs memory_as_buffer = {
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	854 (getbufferproc)memory_getbuf, /* bf_getbuffer */
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	855 (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	856 };
85c22b4d4455 Merged 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	857
85c22b4d4455 Merged 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	858
85c22b4d4455 Merged 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	859 PyTypeObject PyMemoryView_Type = {
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	860 PyVarObject_HEAD_INIT(&PyType_Type, 0)
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	861 "memoryview",
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	862 sizeof(PyMemoryViewObject),
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	863 0,
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	864 (destructor)memory_dealloc, /* tp_dealloc */
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	865 0, /* tp_print */
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	866 0, /* tp_getattr */
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	867 0, /* tp_setattr */
51271 87fbbf22adf3 Merged revisions 69214 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 50501 diff changeset	868 0, /* tp_reserved */
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	869 (reprfunc)memory_repr, /* tp_repr */
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	870 0, /* tp_as_number */
54828 b4d0c020e357 Issue 6329: Fix iteration for memoryviews. Raymond Hettinger <python@rcn.com> parents: 51468 diff changeset	871 &memory_as_sequence, /* tp_as_sequence */
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	872 &memory_as_mapping, /* tp_as_mapping */
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	873 0, /* tp_hash */
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	874 0, /* tp_call */
51468 4313b4d4bdc7 Merged revisions 69438 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51271 diff changeset	875 0, /* tp_str */
50501 de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	876 PyObject_GenericGetAttr, /* tp_getattro */
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	877 0, /* tp_setattro */
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	878 &memory_as_buffer, /* tp_as_buffer */
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	879 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	880 memory_doc, /* tp_doc */
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	881 (traverseproc)memory_traverse, /* tp_traverse */
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	882 (inquiry)memory_clear, /* tp_clear */
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	883 memory_richcompare, /* tp_richcompare */
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	884 0, /* tp_weaklistoffset */
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	885 0, /* tp_iter */
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	886 0, /* tp_iternext */
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	887 memory_methods, /* tp_methods */
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	888 0, /* tp_members */
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	889 memory_getsetlist, /* tp_getset */
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	890 0, /* tp_base */
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	891 0, /* tp_dict */
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	892 0, /* tp_descr_get */
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	893 0, /* tp_descr_set */
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	894 0, /* tp_dictoffset */
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	895 0, /* tp_init */
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	896 0, /* tp_alloc */
de2771070d85 Merged revisions 68212 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50490 diff changeset	897 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	898 };

Mercurial > cpython-lru_cache-weakref

annotate Objects/memoryobject.c @ 65589:46bbbdcd777f