[pypy-commit] pypy py3.5: merge heads

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: py3.5
Changeset: r88524:1922742741cc
Date: 2016-11-21 15:02 +0100
http://bitbucket.org/pypy/pypy/changeset/1922742741cc/

Log:	merge heads

diff --git a/pypy/goal/targetpypystandalone.py b/pypy/goal/targetpypystandalone.py
--- a/pypy/goal/targetpypystandalone.py
+++ b/pypy/goal/targetpypystandalone.py
@@ -119,7 +119,7 @@
         try:
             # initialize sys.{path,executable,stdin,stdout,stderr}
             # (in unbuffered mode, to avoid troubles) and import site
-            space.appexec([w_path, space.wrap(home), w_initstdio],
+            space.appexec([w_path, space.wrap_fsdecoded(home), w_initstdio],
             r"""(path, home, initstdio):
                 import sys
                 sys.path[:] = path