Author: Richard Plangger <planri...@gmail.com>
Branch: py3.5
Changeset: r89446:596ff2168cf5
Date: 2017-01-09 17:01 +0100
http://bitbucket.org/pypy/pypy/changeset/596ff2168cf5/
Log: merge default
diff --git a/pypy/module/cpyext/test/test_memoryobject.py
b/pypy/module/cpyext/test/test_memoryobject.py
--- a/pypy/module/cpyext/test/test_memoryobject.py
+++ b/pypy/module/cpyext/test/test_memoryobject.py
@@ -14,7 +14,7 @@
#assert api.PyObject_CheckBuffer(w_hello)
w_view = from_ref(space, api.PyMemoryView_FromObject(w_hello))
w_char = space.call_method(w_view, '__getitem__', space.wrap(0))
- assert space.eq_w(w_char, space.wrap('h'))
+ assert space.eq_w(w_char, space.wrap(ord('h')))
w_bytes = space.call_method(w_view, "tobytes")
assert space.unwrap(w_bytes) == "hello"
diff --git a/pypy/objspace/std/test/test_memoryobject.py
b/pypy/objspace/std/test/test_memoryobject.py
--- a/pypy/objspace/std/test/test_memoryobject.py
+++ b/pypy/objspace/std/test/test_memoryobject.py
@@ -185,9 +185,9 @@
assert m[2] == 1
def test_pypy_raw_address_base(self):
- a = memoryview("foobar")._pypy_raw_address()
+ a = memoryview(b"foobar")._pypy_raw_address()
assert a != 0
- b = memoryview(bytearray("foobar"))._pypy_raw_address()
+ b = memoryview(bytearray(b"foobar"))._pypy_raw_address()
assert b != 0
def test_hex(self):
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
