[pypy-svn] pypy default: hg merge

[hakanardo]

Author: Hakan Ardo <hakan at debian.org>
Branch: 
Changeset: r40355:e5828b4d7360
Date: 2011-01-03 20:45 +0100
http://bitbucket.org/pypy/pypy/changeset/e5828b4d7360/

Log:	hg merge

diff --git a/pypy/interpreter/baseobjspace.py b/pypy/interpreter/baseobjspace.py
--- a/pypy/interpreter/baseobjspace.py
+++ b/pypy/interpreter/baseobjspace.py
@@ -375,9 +375,9 @@
         else:
             name = importname
 
-        mod = Module(self, self.wrap(name))
-        mod.install()
-
+        w_name = self.wrap(name)
+        w_mod = self.wrap(Module(self, w_name))
+        self.builtin_modules[name] = w_mod
         return name
 
     def getbuiltinmodule(self, name, force_init=False):
@@ -456,23 +456,22 @@
         from pypy.module.exceptions import Module
         w_name = self.wrap('exceptions')
         self.exceptions_module = Module(self, w_name)
-        self.exceptions_module.install()
+        self.builtin_modules['exceptions'] = self.wrap(self.exceptions_module)
 
         from pypy.module.sys import Module
         w_name = self.wrap('sys')
         self.sys = Module(self, w_name)
-        self.sys.install()
+        self.builtin_modules['sys'] = self.wrap(self.sys)
 
         from pypy.module.imp import Module
         w_name = self.wrap('imp')
-        mod = Module(self, w_name)
-        mod.install()
+        self.builtin_modules['imp'] = self.wrap(Module(self, w_name))
 
         from pypy.module.__builtin__ import Module
         w_name = self.wrap('__builtin__')
         self.builtin = Module(self, w_name)
         w_builtin = self.wrap(self.builtin)
-        self.builtin.install()
+        self.builtin_modules['__builtin__'] = self.wrap(w_builtin)
         self.setitem(self.builtin.w_dict, self.wrap('__builtins__'), w_builtin)
 
         bootstrap_modules = set(('sys', 'imp', '__builtin__', 'exceptions'))

diff --git a/pypy/interpreter/test/test_mixedmodule.py b/pypy/interpreter/test/test_mixedmodule.py
deleted file mode 100644
--- a/pypy/interpreter/test/test_mixedmodule.py
+++ /dev/null
@@ -1,57 +0,0 @@
-from pypy.interpreter.mixedmodule import MixedModule
-
-
-class TestMixedModule(object):
-    def test_install(self):
-        class Module(MixedModule):
-            interpleveldefs = {}
-            appleveldefs = {}
-
-        m = Module(self.space, self.space.wrap("test_module"))
-        m.install()
-
-        assert self.space.builtin_modules["test_module"] is m
-
-    def test_submodule(self):
-        class SubModule(MixedModule):
-            interpleveldefs = {}
-            appleveldefs = {}
-
-        class Module(MixedModule):
-            interpleveldefs = {}
-            appleveldefs = {}
-            submodules = {
-                "sub": SubModule
-            }
-
-        m = Module(self.space, self.space.wrap("test_module"))
-        m.install()
-
-        assert self.space.builtin_modules["test_module"] is m
-        assert isinstance(self.space.builtin_modules["test_module.sub"], SubModule)
-
-class AppTestMixedModule(object):
-    def setup_class(cls):
-        space = cls.space
-
-        class SubModule(MixedModule):
-            interpleveldefs = {}
-            appleveldefs = {}
-
-        class Module(MixedModule):
-            interpleveldefs = {}
-            appleveldefs = {}
-            submodules = {
-                "sub": SubModule
-            }
-
-        m = Module(space, space.wrap("test_module"))
-        m.install()
-
-    def test_attibute(self):
-        import test_module
-
-        assert hasattr(test_module, "sub")
-
-    def test_submodule_import(self):
-        from test_module import sub