[pypy-commit] pypy py3k: Fix merge.

[mjacob]

Author: Manuel Jacob <me at manueljacob.de>
Branch: py3k
Changeset: r79012:aea1e4e8b77f
Date: 2015-08-17 02:50 +0200
http://bitbucket.org/pypy/pypy/changeset/aea1e4e8b77f/

Log:	Fix merge.

diff --git a/pypy/goal/targetpypystandalone.py b/pypy/goal/targetpypystandalone.py
--- a/pypy/goal/targetpypystandalone.py
+++ b/pypy/goal/targetpypystandalone.py
@@ -172,7 +172,7 @@
         try:
             w_globals = space.newdict(module=True)
             space.setitem(w_globals, space.wrap('__builtins__'),
-                          space.builtin_modules['__builtin__'])
+                          space.builtin_modules['builtins'])
             space.setitem(w_globals, space.wrap('c_argument'),
                           space.wrap(c_argument))
             space.appexec([space.wrap(source), w_globals], """(src, glob):