Author: Armin Rigo <[email protected]>
Branch: py3.5
Changeset: r89956:25ba5fb90782
Date: 2017-02-05 21:44 +0100
http://bitbucket.org/pypy/pypy/changeset/25ba5fb90782/
Log: fix minor merge error
diff --git a/pypy/module/_cffi_backend/test/test_ffi_obj.py
b/pypy/module/_cffi_backend/test/test_ffi_obj.py
--- a/pypy/module/_cffi_backend/test/test_ffi_obj.py
+++ b/pypy/module/_cffi_backend/test/test_ffi_obj.py
@@ -258,8 +258,6 @@
assert ffi.buffer(a)[:] == b'\x05\x06\x07'
assert ffi.buffer(cdata=a, size=2)[:] == b'\x05\x06'
assert type(ffi.buffer(a)) is ffi.buffer
- assert ffi.buffer(cdata=a, size=2)[:] == b'\x05\x06'
- assert type(ffi.buffer(a)) is ffi.buffer
def test_ffi_from_buffer(self):
import _cffi_backend as _cffi1_backend
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
