[pypy-commit] pypy less-gettestobjspace: progress.

[amauryfa]

Author: Amaury Forgeot d'Arc <amauryfa at gmail.com>
Branch: less-gettestobjspace
Changeset: r58610:b0189dd475fa
Date: 2012-10-28 23:17 +0100
http://bitbucket.org/pypy/pypy/changeset/b0189dd475fa/

Log:	progress.

diff --git a/pypy/module/_csv/test/test_dialect.py b/pypy/module/_csv/test/test_dialect.py
--- a/pypy/module/_csv/test/test_dialect.py
+++ b/pypy/module/_csv/test/test_dialect.py
@@ -1,9 +1,5 @@
-from pypy.conftest import gettestobjspace
-
-
 class AppTestDialect(object):
-    def setup_class(cls):
-        cls.space = gettestobjspace(usemodules=['_csv'])
+    spaceconfig = dict(usemodules=['_csv'])
 
     def test_register_dialect(self):
         import _csv
diff --git a/pypy/module/_csv/test/test_reader.py b/pypy/module/_csv/test/test_reader.py
--- a/pypy/module/_csv/test/test_reader.py
+++ b/pypy/module/_csv/test/test_reader.py
@@ -1,10 +1,7 @@
-from pypy.conftest import gettestobjspace
+class AppTestReader(object):
+    spaceconfig = dict(usemodules=['_csv'])
 
-
-class AppTestReader(object):
     def setup_class(cls):
-        cls.space = gettestobjspace(usemodules=['_csv'])
-
         w__read_test = cls.space.appexec([], r"""():
             import _csv
             def _read_test(input, expect, **kwargs):
diff --git a/pypy/module/_csv/test/test_writer.py b/pypy/module/_csv/test/test_writer.py
--- a/pypy/module/_csv/test/test_writer.py
+++ b/pypy/module/_csv/test/test_writer.py
@@ -1,10 +1,7 @@
-from pypy.conftest import gettestobjspace
+class AppTestWriter(object):
+    spaceconfig = dict(usemodules=['_csv'])
 
-
-class AppTestWriter(object):
     def setup_class(cls):
-        cls.space = gettestobjspace(usemodules=['_csv'])
-
         w__write_test = cls.space.appexec([], r"""():
             import _csv
 
diff --git a/pypy/module/_demo/test/test_import.py b/pypy/module/_demo/test/test_import.py
--- a/pypy/module/_demo/test/test_import.py
+++ b/pypy/module/_demo/test/test_import.py
@@ -1,5 +1,5 @@
-from pypy.conftest import gettestobjspace
 from pypy.module import _demo
+from pypy.tool.option import make_config, make_objspace
 
 class TestImport:
 
@@ -7,7 +7,8 @@
         _demo.Module.demo_events = []
 
     def test_startup(self):
-        space = gettestobjspace(usemodules=('_demo',))
+        config = make_config(None, usemodules=('_demo',))
+        space = make_objspace(config)
         w_modules = space.sys.get('modules')
 
         assert _demo.Module.demo_events == ['setup']
diff --git a/pypy/module/_demo/test/test_sieve.py b/pypy/module/_demo/test/test_sieve.py
--- a/pypy/module/_demo/test/test_sieve.py
+++ b/pypy/module/_demo/test/test_sieve.py
@@ -1,9 +1,5 @@
-from pypy.conftest import gettestobjspace
-
-
 class AppTestSieve:
-    def setup_class(cls):
-        cls.space = gettestobjspace(usemodules=('_demo',))
+    spaceconfig = dict(usemodules=('_demo',))
 
     def test_sieve(self):
         import _demo
diff --git a/pypy/module/cStringIO/test/test_interp_stringio.py b/pypy/module/cStringIO/test/test_interp_stringio.py
--- a/pypy/module/cStringIO/test/test_interp_stringio.py
+++ b/pypy/module/cStringIO/test/test_interp_stringio.py
@@ -1,16 +1,12 @@
-
-from pypy.conftest import gettestobjspace
-
 import os, sys, py
 
 
 class AppTestcStringIO:
+    spaceconfig = dict(usemodules=('cStringIO',))
     def setup_class(cls):
-        space = gettestobjspace(usemodules=('cStringIO',))
-        cls.space = space
-        cls.w_write_many_expected_result = space.wrap(''.join(
+        cls.w_write_many_expected_result = cls.space.wrap(''.join(
             [chr(i) for j in range(10) for i in range(253)]))
-        cls.w_StringIO = space.appexec([], """():
+        cls.w_StringIO = cls.space.appexec([], """():
             import cStringIO
             return cStringIO.StringIO
         """)
diff --git a/pypy/module/crypt/test/test_crypt.py b/pypy/module/crypt/test/test_crypt.py
--- a/pypy/module/crypt/test/test_crypt.py
+++ b/pypy/module/crypt/test/test_crypt.py
@@ -1,9 +1,7 @@
-from pypy.conftest import gettestobjspace
-
 class AppTestCrypt: 
-    def setup_class(cls):
-        cls.space = gettestobjspace(usemodules=['crypt'])
-    def test_crypt(self):
+    spaceconfig = dict(usemodules=['crypt'])
+ 
+   def test_crypt(self):
         import crypt 
         res = crypt.crypt("pass", "ab")
         assert isinstance(res, str)
diff --git a/pypy/module/errno/test/test_errno.py b/pypy/module/errno/test/test_errno.py
--- a/pypy/module/errno/test/test_errno.py
+++ b/pypy/module/errno/test/test_errno.py
@@ -1,14 +1,11 @@
-from pypy.conftest import gettestobjspace
-import py
 import errno
-def setup_module(mod): 
-    mod.space = gettestobjspace(usemodules=['errno'])
 
-class AppTestErrno: 
+class AppTestErrno:
+    spaceconfig = dict(usemodules=['errno'])
+
     def setup_class(cls): 
-        cls.space = space 
-        cls.w_errno = space.appexec([], "(): import errno ; return errno")
-        cls.w_errorcode = space.wrap(errno.errorcode)
+        cls.w_errno = cls.space.appexec([], "(): import errno ; return errno")
+        cls.w_errorcode = cls.space.wrap(errno.errorcode)
 
     def test_posix(self):
         assert self.errno.__file__
diff --git a/pypy/module/exceptions/test/test_exc.py b/pypy/module/exceptions/test/test_exc.py
--- a/pypy/module/exceptions/test/test_exc.py
+++ b/pypy/module/exceptions/test/test_exc.py
@@ -1,9 +1,6 @@
-
-from pypy.conftest import gettestobjspace
 
 class AppTestExc(object):
-    def setup_class(cls):
-        cls.space = gettestobjspace(usemodules=('exceptions',))
+    spaceconfig = dict(usemodules=('exceptions',))
 
     def test_baseexc(self):
         from exceptions import BaseException