annotate Objects/memoryobject.c @ 58765:2ba7677bfa95 legacy-trunk

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