Author: Antonio Cuni <[email protected]>
Branch: cpyext-avoid-roundtrip
Changeset: r92834:7b4e95e7c3b7
Date: 2017-10-23 17:56 +0200
http://bitbucket.org/pypy/pypy/changeset/7b4e95e7c3b7/
Log: merge heads
diff --git a/pypy/module/cpyext/methodobject.py
b/pypy/module/cpyext/methodobject.py
--- a/pypy/module/cpyext/methodobject.py
+++ b/pypy/module/cpyext/methodobject.py
@@ -188,11 +188,10 @@
return isinstance(w_obj, BuiltinFunction)
class W_PyCClassMethodObject(W_PyCFunctionObject):
- w_self = None
+
def __init__(self, space, ml, w_type):
+ W_PyCFunctionObject.__init__(self, space, ml, w_self=None)
self.space = space
- self.ml = ml
- self.name = rffi.charp2str(rffi.cast(rffi.CCHARP, ml.c_ml_name))
self.w_objclass = w_type
def __repr__(self):
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
