[pypy-svn] r48505 - pypy/branch/unicode-objspace/pypy/objspace/std

[fijal at codespeak.net]

Author: fijal
Date: Sat Nov 10 14:13:39 2007
New Revision: 48505

Modified:
   pypy/branch/unicode-objspace/pypy/objspace/std/formatting.py
   pypy/branch/unicode-objspace/pypy/objspace/std/unicodetype.py
Log:
Another towards-annotation-complete fixes.


Modified: pypy/branch/unicode-objspace/pypy/objspace/std/formatting.py
==============================================================================
--- pypy/branch/unicode-objspace/pypy/objspace/std/formatting.py	(original)
+++ pypy/branch/unicode-objspace/pypy/objspace/std/formatting.py	Sat Nov 10 14:13:39 2007
@@ -442,7 +442,7 @@
         fmt = space.unicode_w(w_fmt)
     formatter = UnicodeFormatter(space, fmt, values_w, w_valuedict)
     result = formatter.format()
-    return space.wrap(''.join(result))
+    return space.wrap(u''.join(result))
 
 def mod_format(space, w_format, w_values, do_unicode=False):
     if space.is_true(space.isinstance(w_values, space.w_tuple)):

Modified: pypy/branch/unicode-objspace/pypy/objspace/std/unicodetype.py
==============================================================================
--- pypy/branch/unicode-objspace/pypy/objspace/std/unicodetype.py	(original)
+++ pypy/branch/unicode-objspace/pypy/objspace/std/unicodetype.py	Sat Nov 10 14:13:39 2007
@@ -177,7 +177,7 @@
             else:
                 raise
         else:
-            w_res = space.call(w_unicode_method)
+            w_res = space.call(w_unicode_method, space.newlist([]))
     if space.is_true(space.isinstance(w_res, space.w_unicode)):
         return w_res
     return unicode_from_encoded_object(space, w_res, None, "strict")