[pypy-commit] pypy less-gettestobjspace: Progress

[amauryfa]

Author: Amaury Forgeot d'Arc <amauryfa at gmail.com>
Branch: less-gettestobjspace
Changeset: r58604:f9962d21d772
Date: 2012-10-28 21:58 +0100
http://bitbucket.org/pypy/pypy/changeset/f9962d21d772/

Log:	Progress

diff --git a/pypy/module/_ast/test/test_ast.py b/pypy/module/_ast/test/test_ast.py
--- a/pypy/module/_ast/test/test_ast.py
+++ b/pypy/module/_ast/test/test_ast.py
@@ -1,16 +1,13 @@
 import py
-from pypy.conftest import gettestobjspace
 
 class AppTestAST:
+    spaceconfig = dict(usemodules=['struct'])
 
     def setup_class(cls):
-        cls.space = gettestobjspace(usemodules=['struct'])
-        cls.w_ast = cls.space.appexec([], """():
-    import _ast
-    return _ast""")
+        cls.w_ast = cls.space.getbuiltinmodule('_ast')
 
     def w_get_ast(self, source, mode="exec"):
-        import _ast as ast
+        ast = self.ast
         mod = compile(source, "<test>", mode, ast.PyCF_ONLY_AST)
         assert isinstance(mod, ast.mod)
         return mod
diff --git a/pypy/module/array/test/test_array.py b/pypy/module/array/test/test_array.py
--- a/pypy/module/array/test/test_array.py
+++ b/pypy/module/array/test/test_array.py
@@ -1,12 +1,11 @@
-from pypy.conftest import gettestobjspace
 import sys
 import py
 import py.test
 
 
 ## class AppTestSimpleArray:
+##     spaceconfig = dict(usemodules=('array',))
 ##     def setup_class(cls):
-##         cls.space = gettestobjspace(usemodules=('array',))
 ##         cls.w_simple_array = cls.space.appexec([], """():
 ##             import array
 ##             return array.simple_array
@@ -879,11 +878,9 @@
         cls.maxint = sys.maxint
 
 class AppTestArray(BaseArrayTests):
-    OPTIONS = {}
+    spaceconfig = dict(usemodules=('array', 'struct', '_rawffi'))
 
     def setup_class(cls):
-        cls.space = gettestobjspace(usemodules=('array', 'struct', '_rawffi'),
-                                    **cls.OPTIONS)
         cls.w_array = cls.space.appexec([], """():
             import array
             return array.array
@@ -956,4 +953,6 @@
 
 
 class AppTestArrayBuiltinShortcut(AppTestArray):
-    OPTIONS = {'objspace.std.builtinshortcut': True}
+    spaceconfig = AppTestArray.spaceconfig.copy()
+    spaceconfig['objspace.std.builtinshortcut'] = True
+