[pypy-svn] r55940 - pypy/dist/pypy/objspace/std

[fijal at codespeak.net]

Author: fijal
Date: Wed Jun 18 02:23:04 2008
New Revision: 55940

Modified:
   pypy/dist/pypy/objspace/std/unicodeobject.py
Log:
A test and a fix


Modified: pypy/dist/pypy/objspace/std/unicodeobject.py
==============================================================================
--- pypy/dist/pypy/objspace/std/unicodeobject.py	(original)
+++ pypy/dist/pypy/objspace/std/unicodeobject.py	Wed Jun 18 02:23:04 2008
@@ -775,10 +775,10 @@
 
 def unicode_decode__Unicode_ANY_ANY(space, w_unicode, w_encoding=None, w_errors=None):
     from pypy.objspace.std.unicodetype import _get_encoding_and_errors,\
-         decode_object
+         decode_object, unicode_from_string
     encoding, errors = _get_encoding_and_errors(space, w_encoding, w_errors)
     if encoding is None and errors is None:
-        return unicode_from_string(space, w_string)
+        return unicode_from_string(space, w_unicode)
     return decode_object(space, w_unicode, encoding, errors)
 
 def unicode_partition__Unicode_Unicode(space, w_unistr, w_unisub):