[pypy-commit] pypy kill-someobject: Fixes

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: kill-someobject
Changeset: r57948:9fb4be9f0458
Date: 2012-10-09 15:37 +0200
http://bitbucket.org/pypy/pypy/changeset/9fb4be9f0458/

Log:	Fixes

diff --git a/pypy/rpython/lltypesystem/test/test_rffi.py b/pypy/rpython/lltypesystem/test/test_rffi.py
--- a/pypy/rpython/lltypesystem/test/test_rffi.py
+++ b/pypy/rpython/lltypesystem/test/test_rffi.py
@@ -113,7 +113,7 @@
             return len(res)
     
         xf = self.compile(f, [], backendopt=False)
-        assert xf(expected_extra_mallocs=-1) == 3
+        assert xf() == 3
     
     def test_stringstar(self):
         c_source = """
@@ -503,7 +503,8 @@
             try:
                 for i in range(len(d)):
                     raw_buf[i] = d[i]
-                return unicode_from_buffer(raw_buf, gc_buf, len(d), len(d)-1)
+                return (unicode_from_buffer(raw_buf, gc_buf, len(d), len(d)-1)
+                        .encode('ascii'))
             finally:
                 keep_unicodebuffer_alive_until_here(raw_buf, gc_buf)
         assert f() == d[:-1]