[pypy-svn] r73464 - in pypy/branch/cpython-extension/pypy: interpreter module/cpyext

[afa at codespeak.net]

Author: afa
Date: Tue Apr  6 19:51:43 2010
New Revision: 73464

Modified:
   pypy/branch/cpython-extension/pypy/interpreter/typedef.py
   pypy/branch/cpython-extension/pypy/module/cpyext/typeobject.py
Log:
Fix translation of the GetSetProperty objects


Modified: pypy/branch/cpython-extension/pypy/interpreter/typedef.py
==============================================================================
--- pypy/branch/cpython-extension/pypy/interpreter/typedef.py	(original)
+++ pypy/branch/cpython-extension/pypy/interpreter/typedef.py	Tue Apr  6 19:51:43 2010
@@ -301,7 +301,7 @@
 
 # ____________________________________________________________
 
- at specialize.arg(0, 2)
+ at specialize.arg(0)
 def make_descr_typecheck_wrapper(tag, func, extraargs=(), cls=None,
                                  use_closure=False):
     if func is None:
@@ -399,12 +399,12 @@
     def __init__(self, fget, fset=None, fdel=None, doc=None,
                  cls=None, use_closure=False, tag=None):
         objclass_getter, cls = make_objclass_getter(tag, fget, cls)
-        fget = make_descr_typecheck_wrapper(tag, fget, cls=cls,
-                                            use_closure=use_closure)
-        fset = make_descr_typecheck_wrapper(tag, fset, ('w_value',), cls=cls,
-                                            use_closure=use_closure)
-        fdel = make_descr_typecheck_wrapper(tag, fdel, cls=cls,
-                                            use_closure=use_closure)
+        fget = make_descr_typecheck_wrapper((tag, 0), fget,
+                                            cls=cls, use_closure=use_closure)
+        fset = make_descr_typecheck_wrapper((tag, 1), fset, ('w_value',),
+                                            cls=cls, use_closure=use_closure)
+        fdel = make_descr_typecheck_wrapper((tag, 2), fdel,
+                                            cls=cls, use_closure=use_closure)
         self.fget = fget
         self.fset = fset
         self.fdel = fdel

Modified: pypy/branch/cpython-extension/pypy/module/cpyext/typeobject.py
==============================================================================
--- pypy/branch/cpython-extension/pypy/module/cpyext/typeobject.py	(original)
+++ pypy/branch/cpython-extension/pypy/module/cpyext/typeobject.py	Tue Apr  6 19:51:43 2010
@@ -51,7 +51,7 @@
         if getset.c_set:
             set = GettersAndSetters.setter.im_func
         GetSetProperty.__init__(self, get, set, None, doc,
-                                cls=None, use_closure=True, # XXX cls?
+                                cls=None, use_closure=True,
                                 tag="cpyext_1")
 
 def PyDescr_NewGetSet(space, getset, pto):
@@ -70,7 +70,7 @@
         if not (flags & structmemberdefs.READONLY):
             set = GettersAndSetters.member_setter.im_func
         GetSetProperty.__init__(self, get, set, del_, doc,
-                                cls=None, use_closure=True, # XXX cls?
+                                cls=None, use_closure=True,
                                 tag="cpyext_2")
 
 def convert_getset_defs(space, dict_w, getsets, pto):