[pypy-svn] r69956 - pypy/trunk/pypy/interpreter

[afa at codespeak.net]

Author: afa
Date: Mon Dec  7 18:47:49 2009
New Revision: 69956

Modified:
   pypy/trunk/pypy/interpreter/baseobjspace.py
Log:
Force __builtin__ in the initial list of sys.modules.
This fixes tests in module/sys and module/zipimport


Modified: pypy/trunk/pypy/interpreter/baseobjspace.py
==============================================================================
--- pypy/trunk/pypy/interpreter/baseobjspace.py	(original)
+++ pypy/trunk/pypy/interpreter/baseobjspace.py	Mon Dec  7 18:47:49 2009
@@ -511,6 +511,7 @@
     def setup_builtin_modules(self):
         "NOT_RPYTHON: only for initializing the space."
         self.getbuiltinmodule('sys')
+        self.getbuiltinmodule('__builtin__')
         for mod in self.builtin_modules.values():
             mod.setup_after_space_initialization()