[pypy-commit] pypy py3k: Oops, fix merge.

[amauryfa]

Author: Amaury Forgeot d'Arc <amauryfa at gmail.com>
Branch: py3k
Changeset: r57540:6a71f9e9ff7f
Date: 2012-09-25 01:17 +0200
http://bitbucket.org/pypy/pypy/changeset/6a71f9e9ff7f/

Log:	Oops, fix merge.

diff --git a/pypy/module/_codecs/interp_codecs.py b/pypy/module/_codecs/interp_codecs.py
--- a/pypy/module/_codecs/interp_codecs.py
+++ b/pypy/module/_codecs/interp_codecs.py
@@ -495,7 +495,7 @@
     result = runicode.unicode_encode_utf_8(
         uni, len(uni), errors, state.encode_error_handler,
         allow_surrogates=True)
-    return space.newtuple([space.wrap(result), space.wrap(len(uni))])
+    return space.newtuple([space.wrapbytes(result), space.wrap(len(uni))])
 
 @unwrap_spec(string='bufferstr', errors='str_or_None')
 def utf_8_decode(space, string, errors="strict", w_final=False):