[pypy-commit] cffi default: merge heads

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: 
Changeset: r1218:c15983a2607b
Date: 2013-03-31 19:15 +0200
http://bitbucket.org/cffi/cffi/changeset/c15983a2607b/

Log:	merge heads

diff --git a/testing/backend_tests.py b/testing/backend_tests.py
--- a/testing/backend_tests.py
+++ b/testing/backend_tests.py
@@ -1094,7 +1094,7 @@
             assert content.startswith(b'\x64\x00\x00\x00\x65\x00\x00\x00')
             b[4] = b'\x45'
         else:
-            assert content.startswith('\x00\x00\x00\x64\x00\x00\x00\x65')
+            assert content.startswith(b'\x00\x00\x00\x64\x00\x00\x00\x65')
             b[7] = b'\x45'
         assert len(content) == 4 * 10
         assert a[1] == 0x45
diff --git a/testing/test_function.py b/testing/test_function.py
--- a/testing/test_function.py
+++ b/testing/test_function.py
@@ -173,7 +173,7 @@
         res = fd.getvalue()
         if sys.platform == 'win32':
             NIL = b"00000000"
-        elif sys.platform.startswith('linux'):
+        elif sys.platform.startswith(('linux', 'gnu')):
             NIL = b"(nil)"
         else:
             NIL = b"0x0"    # OS/X at least