[pypy-svn] r7578 - pypy/trunk/src/pypy/objspace

mwh at codespeak.net mwh at codespeak.net
Mon Nov 22 18:50:49 CET 2004


Author: mwh
Date: Mon Nov 22 18:50:49 2004
New Revision: 7578

Modified:
   pypy/trunk/src/pypy/objspace/descroperation.py
Log:
this is as least as correct as what went before, and removes the only
call to wrap(SomeObject())!


Modified: pypy/trunk/src/pypy/objspace/descroperation.py
==============================================================================
--- pypy/trunk/src/pypy/objspace/descroperation.py	(original)
+++ pypy/trunk/src/pypy/objspace/descroperation.py	Mon Nov 22 18:50:49 2004
@@ -90,8 +90,10 @@
                 return w_result
         w_descr = space.lookup(w_obj, '__call__')
         if w_descr is None:
-            raise OperationError(space.w_TypeError, 
-                                 space.wrap('object %r is not callable' % (w_obj,)))
+            raise OperationError(
+                space.w_TypeError, 
+                space.mod(space.wrap('object %r is not callable'),
+                          space.newtuple([w_obj])))
         return space.get_and_call_args(w_descr, w_obj, args)
 
     def get(space, w_descr, w_obj, w_type=None):



More information about the Pypy-commit mailing list