Author: Manuel Jacob
Branch: py3k
Changeset: r61377:976cb0174d70
Date: 2013-02-17 17:06 +0100
http://bitbucket.org/pypy/pypy/changeset/976cb0174d70/
Log: Fix these tests to use the new API for _rawffi char Arrays.
diff --git a/pypy/module/_rawffi/test/test_nested.py
b/pypy/module/_rawffi/test/test_nested.py
--- a/pypy/module/_rawffi/test/test_nested.py
+++ b/pypy/module/_rawffi/test/test_nested.py
@@ -43,14 +43,14 @@
assert S.fieldoffset('x') == 0
assert S.fieldoffset('s1') == S1.alignment
s = S()
- s.x = ord('G')
+ s.x = b'G'
raises(TypeError, 's.s1')
assert s.fieldaddress('s1') == s.buffer + S.fieldoffset('s1')
s1 = S1.fromaddress(s.fieldaddress('s1'))
- s1.c = ord('H')
+ s1.c = b'H'
rawbuf = _rawffi.Array('c').fromaddress(s.buffer, S.size)
- assert rawbuf[0] == ord('G')
- assert rawbuf[S1.alignment + S1.fieldoffset('c')] == ord('H')
+ assert rawbuf[0] == b'G'
+ assert rawbuf[S1.alignment + S1.fieldoffset('c')] == b'H'
s.free()
def test_array_of_structures(self):
@@ -60,17 +60,17 @@
a = A(3)
raises(TypeError, "a[0]")
s0 = S.fromaddress(a.buffer)
- s0.c = ord('B')
+ s0.c = b'B'
assert a.itemaddress(1) == a.buffer + S.size
s1 = S.fromaddress(a.itemaddress(1))
- s1.c = ord('A')
+ s1.c = b'A'
s2 = S.fromaddress(a.itemaddress(2))
- s2.c = ord('Z')
+ s2.c = b'Z'
rawbuf = _rawffi.Array('c').fromaddress(a.buffer, S.size * len(a))
ofs = S.fieldoffset('c')
- assert rawbuf[0*S.size+ofs] == ord('B')
- assert rawbuf[1*S.size+ofs] == ord('A')
- assert rawbuf[2*S.size+ofs] == ord('Z')
+ assert rawbuf[0*S.size+ofs] == b'B'
+ assert rawbuf[1*S.size+ofs] == b'A'
+ assert rawbuf[2*S.size+ofs] == b'Z'
a.free()
def test_array_of_array(self):
@@ -103,16 +103,16 @@
assert S.fieldoffset('x') == 0
assert S.fieldoffset('ar') == A5alignment
s = S()
- s.x = ord('G')
+ s.x = b'G'
raises(TypeError, 's.ar')
assert s.fieldaddress('ar') == s.buffer + S.fieldoffset('ar')
a1 = A.fromaddress(s.fieldaddress('ar'), 5)
a1[4] = 33
rawbuf = _rawffi.Array('c').fromaddress(s.buffer, S.size)
- assert rawbuf[0] == ord('G')
+ assert rawbuf[0] == b'G'
sizeofint = struct.calcsize("i")
v = 0
for i in range(sizeofint):
- v += rawbuf[A5alignment + sizeofint*4+i]
+ v += ord(rawbuf[A5alignment + sizeofint*4+i])
assert v == 33
s.free()
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
http://mail.python.org/mailman/listinfo/pypy-commit
