[pypy-svn] r4844 - pypy/branch/src-newobjectmodel/pypy/objspace

[pedronis at codespeak.net]

Author: pedronis
Date: Thu Jun  3 09:39:44 2004
New Revision: 4844

Modified:
   pypy/branch/src-newobjectmodel/pypy/objspace/descroperation.py
Log:
fixed some get_and_call -> get_and_call_function


Modified: pypy/branch/src-newobjectmodel/pypy/objspace/descroperation.py
==============================================================================
--- pypy/branch/src-newobjectmodel/pypy/objspace/descroperation.py	(original)
+++ pypy/branch/src-newobjectmodel/pypy/objspace/descroperation.py	Thu Jun  3 09:39:44 2004
@@ -14,19 +14,19 @@
         w_get = space.lookup(w_descr,'__get__')
         if w_get is None:
             raise OperationError(space.w_TypeError) # xxx error
-        return space.get_and_call(w_descr,w_obj,w_type)
+        return space.get_and_call_function(w_descr,w_obj,w_type)
 
     def set(space,w_descr,w_obj,w_val):
         w_get = space.lookup(w_descr,'__set__')
         if w_get is None:
             raise OperationError(space.w_TypeError) # xxx error
-        return space.get_and_call(w_descr,w_obj,w_val)
+        return space.get_and_call_function(w_descr,w_obj,w_val)
 
     def delete(space,w_descr,w_obj):
         w_get = space.lookup(w_descr,'__get__')
         if w_get is None:
             raise OperationError(space.w_TypeError) # xxx error
-        return space.get_and_call(w_descr,w_obj)
+        return space.get_and_call_function(w_descr,w_obj)
 
     def getattr(space,w_obj,w_name):
         w_descr = space.lookup(w_obj,'__getattribute__')