1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
|
""" HPyType slot tests on legacy types. """
from .support import HPyTest, make_hpy_abi_fixture
from .test_hpytype_legacy import LegacyPointTemplate
from .test_slots import TestSlots as _TestSlots, TestSqSlots as _TestSqSlots
hpy_abi = make_hpy_abi_fixture('with hybrid')
class TestLegacySlots(_TestSlots):
ExtensionTemplate = LegacyPointTemplate
class TestLegacySqSlots(_TestSqSlots):
ExtensionTemplate = LegacyPointTemplate
class TestCustomLegacySlotsFeatures(HPyTest):
def test_legacy_slots(self):
mod = self.make_module("""
#include <Python.h>
static PyObject *Dummy_repr(PyObject *self)
{
return PyUnicode_FromString("myrepr");
}
static PyObject *Dummy_add(PyObject *self, PyObject *other)
{
return Py_BuildValue("OO", self, other);
}
HPyDef_SLOT(Dummy_abs, HPy_nb_absolute);
static HPy Dummy_abs_impl(HPyContext *ctx, HPy self)
{
return HPyLong_FromLong(ctx, 1234);
}
static HPyDef *Dummy_defines[] = {
&Dummy_abs,
NULL
};
static PyType_Slot Dummy_type_slots[] = {
{Py_tp_repr, (void*)Dummy_repr},
{Py_nb_add, (void*)Dummy_add},
{0, 0},
};
static HPyType_Spec Dummy_spec = {
.name = "mytest.Dummy",
.builtin_shape = HPyType_BuiltinShape_Legacy,
.legacy_slots = Dummy_type_slots,
.defines = Dummy_defines
};
@EXPORT_TYPE("Dummy", Dummy_spec)
@INIT
""")
d = mod.Dummy()
assert repr(d) == 'myrepr'
assert d + 42 == (d, 42)
assert abs(d) == 1234
def test_legacy_slots_methods(self):
mod = self.make_module("""
#include <Python.h>
static PyObject *Dummy_foo(PyObject *self, PyObject *arg)
{
Py_INCREF(arg);
return arg;
}
HPyDef_METH(Dummy_bar, "bar", HPyFunc_NOARGS)
static HPy Dummy_bar_impl(HPyContext *ctx, HPy self)
{
return HPyLong_FromLong(ctx, 1234);
}
static PyMethodDef dummy_methods[] = {
{"foo", Dummy_foo, METH_O},
{NULL, NULL} /* Sentinel */
};
static PyType_Slot dummy_type_slots[] = {
{Py_tp_methods, dummy_methods},
{0, 0},
};
static HPyDef *dummy_type_defines[] = {
&Dummy_bar,
NULL
};
static HPyType_Spec dummy_type_spec = {
.name = "mytest.Dummy",
.builtin_shape = HPyType_BuiltinShape_Legacy,
.legacy_slots = dummy_type_slots,
.defines = dummy_type_defines
};
@EXPORT_TYPE("Dummy", dummy_type_spec)
@INIT
""")
d = mod.Dummy()
assert d.foo(21) == 21
assert d.bar() == 1234
def test_legacy_slots_members(self):
import pytest
mod = self.make_module("""
#include <Python.h>
#include "structmember.h"
typedef struct {
PyObject_HEAD
long x;
long y;
} PointObject;
HPyDef_SLOT(Point_new, HPy_tp_new)
static HPy Point_new_impl(HPyContext *ctx, HPy cls, const HPy *args,
HPy_ssize_t nargs, HPy kw)
{
PointObject *point;
HPy h_point = HPy_New(ctx, cls, &point);
if (HPy_IsNull(h_point))
return HPy_NULL;
point->x = 7;
point->y = 3;
return h_point;
}
HPyDef_MEMBER(Point_x, "x", HPyMember_LONG, offsetof(PointObject, x))
// legacy members
static PyMemberDef legacy_members[] = {
{"y", T_LONG, offsetof(PointObject, y), 0},
{"y_ro", T_LONG, offsetof(PointObject, y), READONLY},
{NULL}
};
static PyType_Slot legacy_slots[] = {
{Py_tp_members, legacy_members},
{0, NULL}
};
static HPyDef *Point_defines[] = {
&Point_new,
&Point_x,
NULL
};
static HPyType_Spec Point_spec = {
.name = "mytest.Point",
.basicsize = sizeof(PointObject),
.builtin_shape = HPyType_BuiltinShape_Legacy,
.legacy_slots = legacy_slots,
.defines = Point_defines
};
@EXPORT_TYPE("Point", Point_spec)
@INIT
""")
p = mod.Point()
assert p.x == 7
assert p.y == 3
assert p.y_ro == 3
p.x = 123
p.y = 456
with pytest.raises(AttributeError):
p.y_ro = 789
assert p.x == 123
assert p.y == 456
def test_legacy_slots_getsets(self):
mod = self.make_module("""
#include <Python.h>
typedef struct {
PyObject_HEAD
long x;
long y;
} PointObject;
HPyDef_SLOT(Point_new, HPy_tp_new)
static HPy Point_new_impl(HPyContext *ctx, HPy cls, const HPy *args,
HPy_ssize_t nargs, HPy kw)
{
PointObject *point;
HPy h_point = HPy_New(ctx, cls, &point);
if (HPy_IsNull(h_point))
return HPy_NULL;
point->x = 7;
point->y = 3;
return h_point;
}
static PyObject *z_get(PointObject *point, void *closure)
{
long z = point->x*10 + point->y + (long)(HPy_ssize_t)closure;
return PyLong_FromLong(z);
}
// legacy getsets
static PyGetSetDef legacy_getsets[] = {
{"z", (getter)z_get, NULL, NULL, (void *)2000},
{NULL}
};
static PyType_Slot legacy_slots[] = {
{Py_tp_getset, legacy_getsets},
{0, NULL}
};
static HPyDef *Point_defines[] = {
&Point_new,
NULL
};
static HPyType_Spec Point_spec = {
.name = "mytest.Point",
.basicsize = sizeof(PointObject),
.builtin_shape = HPyType_BuiltinShape_Legacy,
.legacy_slots = legacy_slots,
.defines = Point_defines
};
@EXPORT_TYPE("Point", Point_spec)
@INIT
""")
p = mod.Point()
assert p.z == 2073
def test_legacy_slots_fails_without_legacy(self):
import pytest
mod_src = """
#include <Python.h>
static PyObject *Dummy_foo(PyObject *self, PyObject *arg)
{
Py_INCREF(arg);
return arg;
}
static PyMethodDef dummy_methods[] = {
{"foo", Dummy_foo, METH_O},
{NULL, NULL} /* Sentinel */
};
static PyType_Slot dummy_type_slots[] = {
{Py_tp_methods, dummy_methods},
{0, 0},
};
static HPyType_Spec dummy_type_spec = {
.name = "mytest.Dummy",
.builtin_shape = HPyType_BuiltinShape_Object,
.legacy_slots = dummy_type_slots,
};
@EXPORT_TYPE("Dummy", dummy_type_spec)
@INIT
"""
with pytest.raises(TypeError) as err:
self.make_module(mod_src)
assert str(err.value) == (
"cannot specify .legacy_slots without setting .builtin_shape=HPyType_BuiltinShape_Legacy")
|
