@@ -28,7 +28,7 @@ def test_native_types(self):
28
28
if shape :
29
29
self .assertEqual (len (v ), shape [0 ])
30
30
else :
31
- self .assertEqual ( len ( v ) * sizeof ( itemtp ), sizeof ( ob ) )
31
+ self .assertRaises ( TypeError , len , v )
32
32
self .assertEqual (v .itemsize , sizeof (itemtp ))
33
33
self .assertEqual (v .shape , shape )
34
34
# XXX Issue #12851: PyCData_NewGetBuffer() must provide strides
@@ -39,11 +39,10 @@ def test_native_types(self):
39
39
# they are always read/write
40
40
self .assertFalse (v .readonly )
41
41
42
- if v .shape :
43
- n = 1
44
- for dim in v .shape :
45
- n = n * dim
46
- self .assertEqual (n * v .itemsize , len (v .tobytes ()))
42
+ n = 1
43
+ for dim in v .shape :
44
+ n = n * dim
45
+ self .assertEqual (n * v .itemsize , len (v .tobytes ()))
47
46
except :
48
47
# so that we can see the failing type
49
48
print (tp )
@@ -58,7 +57,7 @@ def test_endian_types(self):
58
57
if shape :
59
58
self .assertEqual (len (v ), shape [0 ])
60
59
else :
61
- self .assertEqual ( len ( v ) * sizeof ( itemtp ), sizeof ( ob ) )
60
+ self .assertRaises ( TypeError , len , v )
62
61
self .assertEqual (v .itemsize , sizeof (itemtp ))
63
62
self .assertEqual (v .shape , shape )
64
63
# XXX Issue #12851
@@ -67,11 +66,10 @@ def test_endian_types(self):
67
66
# they are always read/write
68
67
self .assertFalse (v .readonly )
69
68
70
- if v .shape :
71
- n = 1
72
- for dim in v .shape :
73
- n = n * dim
74
- self .assertEqual (n , len (v ))
69
+ n = 1
70
+ for dim in v .shape :
71
+ n = n * dim
72
+ self .assertEqual (n * v .itemsize , len (v .tobytes ()))
75
73
except :
76
74
# so that we can see the failing type
77
75
print (tp )
@@ -243,7 +241,7 @@ class LEPoint(LittleEndianStructure):
243
241
#
244
242
endian_types = [
245
243
(BEPoint , "T{>l:x:>l:y:}" .replace ('l' , s_long ), (), BEPoint ),
246
- (LEPoint , "T{<l:x:<l:y:}" .replace ('l' , s_long ), (), LEPoint ),
244
+ (LEPoint * 1 , "T{<l:x:<l:y:}" .replace ('l' , s_long ), (1 , ), LEPoint ),
247
245
(POINTER (BEPoint ), "&T{>l:x:>l:y:}" .replace ('l' , s_long ), (), POINTER (BEPoint )),
248
246
(POINTER (LEPoint ), "&T{<l:x:<l:y:}" .replace ('l' , s_long ), (), POINTER (LEPoint )),
249
247
]
0 commit comments