[pypy-commit] pypy py3k: bah, confusion: the str in str_w is of course the interp-level str, we want unicode_w to unwrap the applevel str. Obvious, isn't it? :-)

[antocuni]

Author: Antonio Cuni <anto.c...@gmail.com>
Branch: py3k
Changeset: r53806:0c0fd7170ad3
Date: 2012-03-19 18:02 +0100
http://bitbucket.org/pypy/pypy/changeset/0c0fd7170ad3/

Log:    bah, confusion: the str in str_w is of course the interp-level str,
        we want unicode_w to unwrap the applevel str. Obvious, isn't it? :-)

diff --git a/pypy/objspace/std/unicodetype.py b/pypy/objspace/std/unicodetype.py
--- a/pypy/objspace/std/unicodetype.py
+++ b/pypy/objspace/std/unicodetype.py
@@ -299,7 +299,7 @@
         return w_res
     else:
         # Subtype -- return genuine unicode string with the same value.
-        return space.wrap(space.str_w(w_res))
+        return space.wrap(space.unicode_w(w_res))
 
 def descr_new_(space, w_unicodetype, w_object=u'', w_encoding=None, 
w_errors=None):
     # NB. the default value of w_obj is really a *wrapped* empty string:
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
http://mail.python.org/mailman/listinfo/pypy-commit