[pypy-commit] pypy py3k: hg merge default

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: py3k
Changeset: r87276:ec5c171f3870
Date: 2016-09-21 17:10 +0200
http://bitbucket.org/pypy/pypy/changeset/ec5c171f3870/

Log:	hg merge default

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
@@ -507,7 +507,7 @@
     def test_bug_1(self):
         import _cffi_backend as _cffi1_backend
         ffi = _cffi1_backend.FFI()
-        q = ffi.new("char[]", "abcd")
+        q = ffi.new("char[]", b"abcd")
         p = ffi.cast("char(*)(void)", q)
         raises(TypeError, ffi.string, p)