[pypy-svn] rev 1353 - pypy/branch/builtinrefactor/pypy/objspace/std

[arigo at codespeak.net]

Author: arigo
Date: Wed Sep 17 18:21:03 2003
New Revision: 1353

Modified:
   pypy/branch/builtinrefactor/pypy/objspace/std/stringobject.py
Log:
one last hack to have string-% behave in stdobjspace


Modified: pypy/branch/builtinrefactor/pypy/objspace/std/stringobject.py
==============================================================================
--- pypy/branch/builtinrefactor/pypy/objspace/std/stringobject.py	(original)
+++ pypy/branch/builtinrefactor/pypy/objspace/std/stringobject.py	Wed Sep 17 18:21:03 2003
@@ -864,7 +864,16 @@
     return space.wrap("".join(buf))
 
 def mod_str_tuple(space, w_format, w_args):
-    raise NotImplementedError
+    # XXX implement me
+    format = space.unwrap(w_format)
+    args = space.unwrap(w_args)
+    try:
+        s = format % args
+    except TypeError, e:
+        raise OperationError(space.w_TypeError, space.wrap(str(e)))
+    except ValueError, e:
+        raise OperationError(space.w_ValueError, space.wrap(str(e)))
+    return space.wrap(s)
 
 def len__String(space, w_str):
     return space.wrap(len(space.unwrap(w_str)))
@@ -956,7 +965,7 @@
     return mod_str_tuple(space, w_str, space.newtuple([w_item]))
 
 def mod__String_Tuple(space, w_str, w_tuple):
-    return space.wrap(space.unwrap(w_str)%space.unwrap(w_tuple))
+    return mod_str_tuple(space, w_str, w_tuple)
 
 # register all methods 
 register_all(vars(), W_StringType)