[pypy-svn] r8932 - pypy/branch/dist-simpler-multimethods/pypy/objspace/std

[arigo at codespeak.net]

Author: arigo
Date: Sun Feb  6 20:50:35 2005
New Revision: 8932

Modified:
   pypy/branch/dist-simpler-multimethods/pypy/objspace/std/listobject.py
   pypy/branch/dist-simpler-multimethods/pypy/objspace/std/stdtypedef.py
Log:
more typos.  remove debugging prints.


Modified: pypy/branch/dist-simpler-multimethods/pypy/objspace/std/listobject.py
==============================================================================
--- pypy/branch/dist-simpler-multimethods/pypy/objspace/std/listobject.py	(original)
+++ pypy/branch/dist-simpler-multimethods/pypy/objspace/std/listobject.py	Sun Feb  6 20:50:35 2005
@@ -43,7 +43,6 @@
                                (['sequence'], None, None),   # signature
                                [W_ListObject(space, [])])    # default argument
     w_list.ob_size = 0  # XXX think about it later
-    w_iterable = args[0]
     w_iterator = space.iter(w_iterable)
     while True:
         try:

Modified: pypy/branch/dist-simpler-multimethods/pypy/objspace/std/stdtypedef.py
==============================================================================
--- pypy/branch/dist-simpler-multimethods/pypy/objspace/std/stdtypedef.py	(original)
+++ pypy/branch/dist-simpler-multimethods/pypy/objspace/std/stdtypedef.py	Sun Feb  6 20:50:35 2005
@@ -167,7 +167,6 @@
     return prefix, list_of_typeorders
 
 def typeerrormsg(space, operatorsymbol, args_w):
-    print "AAAARGH", operatorsymbol, args_w
     return space.wrap("XXX insert message here")
 
 def wrap_func_in_trampoline(func, multimethod, selfindex=0):
@@ -220,12 +219,10 @@
                           w_res = perform_call(space, %s)
                       except FailedToImplement, e:
                           if e.args:
-                              w_type = e.args[0]
-                              w_value = e.args[1]
+                              raise OperationError(e.args[0], e.args[1])
                           else:
-                              w_value = typeerrormsg(space, %r, [%s])
-                              w_type = space.w_TypeError
-                          raise OperationError(w_type, w_value)
+                              raise OperationError(space.w_TypeError,
+                                  typeerrormsg(space, %r, [%s]))
                       if w_res is None:
                           w_res = space.w_None
                       return w_res