[pypy-commit] cffi default: Python 3 compatibility

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: 
Changeset: r2215:eadeccf56e80
Date: 2015-07-06 19:11 +0200
http://bitbucket.org/cffi/cffi/changeset/eadeccf56e80/

Log:	Python 3 compatibility

diff --git a/testing/cffi0/test_ffi_backend.py b/testing/cffi0/test_ffi_backend.py
--- a/testing/cffi0/test_ffi_backend.py
+++ b/testing/cffi0/test_ffi_backend.py
@@ -62,7 +62,7 @@
         seen = []
         def myalloc(size):
             seen.append(size)
-            return ffi.new("char[]", "X" * size)
+            return ffi.new("char[]", b"X" * size)
         def myfree(raw):
             seen.append(raw)
         alloc1 = ffi.new_allocator(myalloc, myfree)
@@ -94,7 +94,7 @@
         seen = []
         def myalloc(size):
             seen.append(size)
-            return ffi.new("char[]", "X" * size)
+            return ffi.new("char[]", b"X" * size)
         alloc1 = ffi.new_allocator(myalloc)    # no 'free'
         p1 = alloc1("int[10]")
         assert seen == [40]
diff --git a/testing/cffi1/test_ffi_obj.py b/testing/cffi1/test_ffi_obj.py
--- a/testing/cffi1/test_ffi_obj.py
+++ b/testing/cffi1/test_ffi_obj.py
@@ -251,7 +251,7 @@
     seen = []
     def myalloc(size):
         seen.append(size)
-        return ffi.new("char[]", "X" * size)
+        return ffi.new("char[]", b"X" * size)
     def myfree(raw):
         seen.append(raw)
     alloc1 = ffi.new_allocator(myalloc, myfree)
@@ -283,7 +283,7 @@
     seen = []
     def myalloc(size):
         seen.append(size)
-        return ffi.new("char[]", "X" * size)
+        return ffi.new("char[]", b"X" * size)
     alloc1 = ffi.new_allocator(myalloc)    # no 'free'
     p1 = alloc1("int[10]")
     assert seen == [40]
diff --git a/testing/cffi1/test_recompiler.py b/testing/cffi1/test_recompiler.py
--- a/testing/cffi1/test_recompiler.py
+++ b/testing/cffi1/test_recompiler.py
@@ -1115,7 +1115,8 @@
     #
     @ffi.callback("int *(*)(void)")
     def get_my_value():
-        return values + it.next()
+        for nextvalue in it:
+            return values + nextvalue
     lib.get_my_value = get_my_value
     #
     values[0] = 41