Author: Matti Picus <matti.pi...@gmail.com>
Branch: missing-tp_new
Changeset: r89568:574e0c5b9dc8
Date: 2017-01-14 23:17 +0200
http://bitbucket.org/pypy/pypy/changeset/574e0c5b9dc8/
Log: fix merge
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
@@ -562,7 +562,7 @@
slot_fn = w_type.getdictvalue(space, attr)
if slot_fn is None:
return
- @slot_function([PyObject], lltype.Signed, header=header, error=-1)
+ @slot_function([PyObject], lltype.Signed, error=-1)
@func_renamer("cpyext_%s_%s" % (name.replace('.', '_'),
typedef.name))
def slot_func(space, w_obj):
return space.int_w(space.call_function(slot_fn, w_obj))
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
