[pypy-commit] pypy win32-cleanup2: merge default into branch

[mattip]

Author: Matti Picus <matti.picus at gmail.com>
Branch: win32-cleanup2
Changeset: r54640:13e2ebeaf8d2
Date: 2012-04-23 02:37 +0300
http://bitbucket.org/pypy/pypy/changeset/13e2ebeaf8d2/

Log:	merge default into branch

diff --git a/pypy/module/cpyext/slotdefs.py b/pypy/module/cpyext/slotdefs.py
--- a/pypy/module/cpyext/slotdefs.py
+++ b/pypy/module/cpyext/slotdefs.py
@@ -66,7 +66,7 @@
     args_w = space.fixedview(w_args)
     res = generic_cpy_call(space, func_inquiry, w_self)
     if rffi.cast(lltype.Signed, res) == -1:
-        space.fromcache(State).check_and_raise_exception()
+        space.fromcache(State).check_and_raise_exception(always=True)
     return space.wrap(bool(res))
 
 def wrap_getattr(space, w_self, w_args, func):