[pypy-commit] pypy _warnings: merge default into branch

[mattip]

Author: Matti Picus <matti.picus at gmail.com>
Branch: _warnings
Changeset: r87464:53649ba55ddf
Date: 2016-09-30 09:45 +0300
http://bitbucket.org/pypy/pypy/changeset/53649ba55ddf/

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
@@ -217,7 +217,6 @@
     res = generic_cpy_call(space, func_target, w_self, i, j, w_y)
     if rffi.cast(lltype.Signed, res) == -1:
         space.fromcache(State).check_and_raise_exception(always=True)
-    return res
 
 def wrap_lenfunc(space, w_self, w_args, func):
     func_len = rffi.cast(lenfunc, func)