[pypy-svn] r48590 - pypy/branch/more-unicode-improvements/pypy/objspace/std

[cfbolz at codespeak.net]

Author: cfbolz
Date: Mon Nov 12 02:01:08 2007
New Revision: 48590

Modified:
   pypy/branch/more-unicode-improvements/pypy/objspace/std/stringobject.py
   pypy/branch/more-unicode-improvements/pypy/objspace/std/unicodetype.py
Log:
tests are good: fix typos


Modified: pypy/branch/more-unicode-improvements/pypy/objspace/std/stringobject.py
==============================================================================
--- pypy/branch/more-unicode-improvements/pypy/objspace/std/stringobject.py	(original)
+++ pypy/branch/more-unicode-improvements/pypy/objspace/std/stringobject.py	Mon Nov 12 02:01:08 2007
@@ -914,11 +914,11 @@
 
 def str_decode__String_ANY_ANY(space, w_string, w_encoding=None, w_errors=None):
     from pypy.objspace.std.unicodetype import _get_encoding_and_errors, \
-        unicode_from_string, encode_object
+        unicode_from_string, decode_object
     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 encode_object(space, w_string, encoding, errors)
+    return decode_object(space, w_string, encoding, errors)
 
 def str_encode__String_ANY_ANY(space, w_string, w_encoding=None, w_errors=None):
     #import pdb; pdb.set_trace()

Modified: pypy/branch/more-unicode-improvements/pypy/objspace/std/unicodetype.py
==============================================================================
--- pypy/branch/more-unicode-improvements/pypy/objspace/std/unicodetype.py	(original)
+++ pypy/branch/more-unicode-improvements/pypy/objspace/std/unicodetype.py	Mon Nov 12 02:01:08 2007
@@ -172,7 +172,7 @@
                         space.type(w_retval).getname(space, '?')))
     return w_retval
 
-def decode_object(space, w_object, encoding, errors):
+def decode_object(space, w_obj, encoding, errors):
     w_codecs = space.getbuiltinmodule("_codecs")
     if encoding is None:
         encoding = getdefaultencoding(space)