[pypy-commit] pypy py3k: unicodehelper.encode is easier here

[pjenvey]

Author: Philip Jenvey <pjenvey at underboss.org>
Branch: py3k
Changeset: r63183:cce7fe52fb0a
Date: 2013-04-09 16:40 -0700
http://bitbucket.org/pypy/pypy/changeset/cce7fe52fb0a/

Log:	unicodehelper.encode is easier here

diff --git a/pypy/interpreter/pyopcode.py b/pypy/interpreter/pyopcode.py
--- a/pypy/interpreter/pyopcode.py
+++ b/pypy/interpreter/pyopcode.py
@@ -1401,8 +1401,8 @@
     from pypy.interpreter.astcompiler import consts
 
     if space.isinstance_w(w_source, space.w_unicode):
-        from pypy.objspace.std.unicodetype import encode_object
-        w_source = encode_object(space, w_source, None, None)
+        from pypy.interpreter.unicodehelper import encode
+        w_source = encode(space, w_source)
         source = space.bytes0_w(w_source)
         flags |= consts.PyCF_IGNORE_COOKIE
     elif space.isinstance_w(w_source, space.w_bytes):