[pypy-svn] r75132 - pypy/branch/unfreeze-encodings/pypy/objspace/std

fijal at codespeak.net fijal at codespeak.net
Sat Jun 5 19:24:16 CEST 2010


Author: fijal
Date: Sat Jun  5 19:24:15 2010
New Revision: 75132

Modified:
   pypy/branch/unfreeze-encodings/pypy/objspace/std/unicodetype.py
Log:
An attempt (?) to fix translation


Modified: pypy/branch/unfreeze-encodings/pypy/objspace/std/unicodetype.py
==============================================================================
--- pypy/branch/unfreeze-encodings/pypy/objspace/std/unicodetype.py	(original)
+++ pypy/branch/unfreeze-encodings/pypy/objspace/std/unicodetype.py	Sat Jun  5 19:24:15 2010
@@ -201,11 +201,11 @@
             except UnicodeEncodeError, uee:
                 raise OperationError(space.w_UnicodeEncodeError,
                                      space.newtuple([
-                                         space.wrap(uee.encoding),
-                                         space.wrap(uee.object),
-                                         space.wrap(uee.start),
-                                         space.wrap(uee.end),
-                                         space.wrap(uee.reason)]))
+                                         space.wrap(uee.args[0]),
+                                         space.wrap(uee.args[1]),
+                                         space.wrap(uee.args[2]),
+                                         space.wrap(uee.args[3]),
+                                         space.wrap(uee.args[4])]))
         from pypy.module._codecs.interp_codecs import lookup_codec
         w_encoder = space.getitem(lookup_codec(space, encoding), space.wrap(0))
     if errors is None:
@@ -234,9 +234,9 @@
                 return space.wrap(str_decode_utf_8(s, len(s), None)[0])
         except UnicodeDecodeError, ude:
             raise OperationError(space.w_UnicodeDecodeError, space.newtuple(
-                [space.wrap(ude.encoding), space.wrap(ude.object),
-                 space.wrap(ude.start), space.wrap(ude.end),
-                 space.wrap(ude.reason)]))
+                [space.wrap(ude.args[0]), space.wrap(ude.args[1]),
+                 space.wrap(ude.args[2]), space.wrap(ude.args[3]),
+                 space.wrap(ude.args[4])]))
     w_codecs = space.getbuiltinmodule("_codecs")
     w_decode = space.getattr(w_codecs, space.wrap("decode"))
     if errors is None:



More information about the Pypy-commit mailing list