[pypy-svn] r55308 - pypy/dist/pypy/module/_rawffi

[fijal at codespeak.net]

Author: fijal
Date: Tue May 27 19:00:09 2008
New Revision: 55308

Modified:
   pypy/dist/pypy/module/_rawffi/callback.py
Log:
Don't unwrap void result


Modified: pypy/dist/pypy/module/_rawffi/callback.py
==============================================================================
--- pypy/dist/pypy/module/_rawffi/callback.py	(original)
+++ pypy/dist/pypy/module/_rawffi/callback.py	Tue May 27 19:00:09 2008
@@ -33,8 +33,9 @@
         w_args = space.newlist([space.wrap(rffi.cast(rffi.UINT, ll_args[i]))
                                 for i in range(len(argtypes))])
         w_res = space.call(w_callable, w_args)
-        unwrap_value(space, push_elem, ll_res, 0,
-                     letter2tp(space, callback_ptr.result), w_res)
+        if callback_ptr.res != 'O': # don't return void
+            unwrap_value(space, push_elem, ll_res, 0,
+                         letter2tp(space, callback_ptr.result), w_res)
     except OperationError, e:
         tbprint(space, space.wrap(e.application_traceback),
                 space.wrap(e.errorstr(space)))