[pypy-svn] r4873 - in pypy/branch/src-newobjectmodel/pypy: interpreter objspace

[arigo at codespeak.net]

Author: arigo
Date: Thu Jun  3 16:59:54 2004
New Revision: 4873

Modified:
   pypy/branch/src-newobjectmodel/pypy/interpreter/eval.py
   pypy/branch/src-newobjectmodel/pypy/objspace/trivial.py
Log:
Un-confused the name of the CPyWrapper subclasses.


Modified: pypy/branch/src-newobjectmodel/pypy/interpreter/eval.py
==============================================================================
--- pypy/branch/src-newobjectmodel/pypy/interpreter/eval.py	(original)
+++ pypy/branch/src-newobjectmodel/pypy/interpreter/eval.py	Thu Jun  3 16:59:54 2004
@@ -82,7 +82,8 @@
         self.fast2locals()
         return self.w_locals
 
-    def fget_getdictscope(space, self):
+    def fget_getdictscope(space, w_self):
+        self = space.unwrap(w_self)
         return self.getdictscope()
 
     def setdictscope(self, w_locals):

Modified: pypy/branch/src-newobjectmodel/pypy/objspace/trivial.py
==============================================================================
--- pypy/branch/src-newobjectmodel/pypy/objspace/trivial.py	(original)
+++ pypy/branch/src-newobjectmodel/pypy/objspace/trivial.py	Thu Jun  3 16:59:54 2004
@@ -154,7 +154,7 @@
                 def fdel(w_obj, w_descr=descr, space=self):
                     return space.set(w_descr, w_obj)
                 descrdict[descrname] = property(fget, fset, fdel)
-            cls = type(typedef.name, bases, descrdict)
+            cls = type('CPyWrapped '+typedef.name, bases, descrdict)
             typedef.trivialwrapperclass = cls
             return cls