Author: Philip Jenvey <[email protected]>
Branch:
Changeset: r71141:5a6d4233a5f6
Date: 2014-04-29 17:10 -0700
http://bitbucket.org/pypy/pypy/changeset/5a6d4233a5f6/
Log: py3k compat
diff --git a/pypy/module/_rawffi/test/test__rawffi.py
b/pypy/module/_rawffi/test/test__rawffi.py
--- a/pypy/module/_rawffi/test/test__rawffi.py
+++ b/pypy/module/_rawffi/test/test__rawffi.py
@@ -1084,27 +1084,27 @@
s = S(autofree=True)
b = buffer(s)
assert len(b) == 40
- b[4] = 'X'
- b[:3] = 'ABC'
- assert b[:6] == 'ABC\x00X\x00'
+ b[4] = b'X'
+ b[:3] = b'ABC'
+ assert b[:6] == b'ABC\x00X\x00'
A = _rawffi.Array('c')
a = A(10, autofree=True)
- a[3] = 'x'
+ a[3] = b'x'
b = buffer(a)
assert len(b) == 10
- assert b[3] == 'x'
- b[6] = 'y'
- assert a[6] == 'y'
- b[3:5] = 'zt'
- assert a[3] == 'z'
- assert a[4] == 't'
+ assert b[3] == b'x'
+ b[6] = b'y'
+ assert a[6] == b'y'
+ b[3:5] = b'zt'
+ assert a[3] == b'z'
+ assert a[4] == b't'
b = memoryview(a)
assert len(b) == 10
- assert b[3] == 'z'
- b[3] = 'x'
- assert b[3] == 'x'
+ assert b[3] == b'z'
+ b[3] = b'x'
+ assert b[3] == b'x'
def test_union(self):
import _rawffi
diff --git a/pypy/objspace/std/test/test_strbufobject.py
b/pypy/objspace/std/test/test_strbufobject.py
--- a/pypy/objspace/std/test/test_strbufobject.py
+++ b/pypy/objspace/std/test/test_strbufobject.py
@@ -45,9 +45,9 @@
assert len(t) == 4
def test_buffer(self):
- s = 'a'.__add__('b')
- assert buffer(s) == buffer('ab')
- assert memoryview(s) == 'ab'
+ s = b'a'.__add__(b'b')
+ assert buffer(s) == buffer(b'ab')
+ assert memoryview(s) == b'ab'
def test_add_strbuf(self):
# make three strbuf objects
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
