[pypy-commit] cffi cffi-1.0: Python 3.2 support

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: cffi-1.0
Changeset: r1940:63b86a814e12
Date: 2015-05-09 12:00 +0200
http://bitbucket.org/cffi/cffi/changeset/63b86a814e12/

Log:	Python 3.2 support

diff --git a/_cffi1/test_recompiler.py b/_cffi1/test_recompiler.py
--- a/_cffi1/test_recompiler.py
+++ b/_cffi1/test_recompiler.py
@@ -2,6 +2,7 @@
 from cffi import FFI, VerificationError
 from _cffi1 import recompiler
 from _cffi1.udir import udir
+from _cffi1.support import u
 
 
 def check_type_table(input, expected_output, included=None):
@@ -281,7 +282,7 @@
     #
     assert ffi.offsetof("struct foo_s", "a") == 0
     assert ffi.offsetof("struct foo_s", "b") == 4
-    assert ffi.offsetof(u"struct foo_s", u"b") == 4
+    assert ffi.offsetof(u+"struct foo_s", u+"b") == 4
     #
     py.test.raises(TypeError, ffi.addressof, p)
     assert ffi.addressof(p[0]) == p
diff --git a/c/test_c.py b/c/test_c.py
--- a/c/test_c.py
+++ b/c/test_c.py
@@ -3263,7 +3263,7 @@
     BCharP = new_pointer_type(BChar)
     BCharA = new_array_type(BCharP, None)
     py.test.raises(TypeError, from_buffer, BCharA, b"foo")
-    py.test.raises(TypeError, from_buffer, BCharA, u"foo")
+    py.test.raises(TypeError, from_buffer, BCharA, u+"foo")
     py.test.raises(TypeError, from_buffer, BCharA, bytearray(b"foo"))
     try:
         from __builtin__ import buffer
@@ -3271,7 +3271,7 @@
         pass
     else:
         py.test.raises(TypeError, from_buffer, BCharA, buffer(b"foo"))
-        py.test.raises(TypeError, from_buffer, BCharA, buffer(u"foo"))
+        py.test.raises(TypeError, from_buffer, BCharA, buffer(u+"foo"))
         py.test.raises(TypeError, from_buffer, BCharA,
                        buffer(bytearray(b"foo")))
     try: