[pypy-svn] pypy jit-unroll-loops: hg merge default

[hakanardo]

Author: Hakan Ardo <hakan at debian.org>
Branch: jit-unroll-loops
Changeset: r40394:9d8edecfc944
Date: 2011-01-04 17:11 +0100
http://bitbucket.org/pypy/pypy/changeset/9d8edecfc944/

Log:	hg merge default

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