Author: Amaury Forgeot d'Arc <[email protected]>
Branch: less-gettestobjspace
Changeset: r58607:7c02141093f1
Date: 2012-10-28 22:15 +0100
http://bitbucket.org/pypy/pypy/changeset/7c02141093f1/
Log: Progress
diff --git a/pypy/module/_cffi_backend/test/test_c.py
b/pypy/module/_cffi_backend/test/test_c.py
--- a/pypy/module/_cffi_backend/test/test_c.py
+++ b/pypy/module/_cffi_backend/test/test_c.py
@@ -20,7 +20,6 @@
py.test.skip("requires the b'' literal syntax")
from pypy.tool.udir import udir
-from pypy.conftest import gettestobjspace, option
from pypy.interpreter import gateway
from pypy.module._cffi_backend import Module
from pypy.translator.platform import host
@@ -30,9 +29,9 @@
class AppTestC(object):
"""Populated below, hack hack hack."""
+ spaceconfig = dict(usemodules=('_cffi_backend',))
+
def setup_class(cls):
- space = gettestobjspace(usemodules=('_cffi_backend',))
- cls.space = space
testfuncs_w = []
keepalive_funcs = []
@@ -64,7 +63,8 @@
addr = cdll.gettestfunc(w_num)
return space.wrap(addr)
- if option.runappdirect:
+ space = cls.space
+ if cls.option.runappdirect:
def interp2app(func):
def run(*args):
return func(space, *args)
diff --git a/pypy/module/_codecs/test/test_codecs.py
b/pypy/module/_codecs/test/test_codecs.py
--- a/pypy/module/_codecs/test/test_codecs.py
+++ b/pypy/module/_codecs/test/test_codecs.py
@@ -1,11 +1,8 @@
import autopath
-from pypy.conftest import gettestobjspace
class AppTestCodecs:
- def setup_class(cls):
- space = gettestobjspace(usemodules=('unicodedata', 'struct'))
- cls.space = space
+ spaceconfig = dict(usemodules=('unicodedata', 'struct'))
def test_register_noncallable(self):
import _codecs
@@ -122,10 +119,7 @@
assert unicode_escape_decode('\\x61\\x62\\x63') == (u'abc', 12)
class AppTestPartialEvaluation:
-
- def setup_class(cls):
- space = gettestobjspace(usemodules=('array',))
- cls.space = space
+ spaceconfig = dict(usemodules=('array',))
def test_partial_utf8(self):
import _codecs
diff --git a/pypy/module/_collections/test/test_defaultdict.py
b/pypy/module/_collections/test/test_defaultdict.py
--- a/pypy/module/_collections/test/test_defaultdict.py
+++ b/pypy/module/_collections/test/test_defaultdict.py
@@ -1,9 +1,6 @@
-import py
-from pypy.conftest import gettestobjspace
class AppTestBasic:
- def setup_class(cls):
- cls.space = gettestobjspace(usemodules=['_collections'])
+ spaceconfig = dict(usemodules=['_collections'])
def test_basics(self):
from _collections import defaultdict
diff --git a/pypy/module/_collections/test/test_deque.py
b/pypy/module/_collections/test/test_deque.py
--- a/pypy/module/_collections/test/test_deque.py
+++ b/pypy/module/_collections/test/test_deque.py
@@ -1,9 +1,6 @@
-import py
-from pypy.conftest import gettestobjspace
class AppTestBasic:
- def setup_class(cls):
- cls.space = gettestobjspace(usemodules=['_collections'])
+ spaceconfig = dict(usemodules=['_collections'])
def test_basics(self):
from _collections import deque
diff --git a/pypy/module/_continuation/test/support.py
b/pypy/module/_continuation/test/support.py
--- a/pypy/module/_continuation/test/support.py
+++ b/pypy/module/_continuation/test/support.py
@@ -1,12 +1,13 @@
import py
-from pypy.conftest import gettestobjspace
from pypy.rpython.tool.rffi_platform import CompilationError
class BaseAppTest:
+ spaceconfig = dict(usemodules=['_continuation'], continuation=True)
+
def setup_class(cls):
try:
import pypy.rlib.rstacklet
except CompilationError, e:
py.test.skip("cannot import rstacklet: %s" % e)
- cls.space = gettestobjspace(usemodules=['_continuation'],
continuation=True)
+
diff --git a/pypy/module/_continuation/test/test_zpickle.py
b/pypy/module/_continuation/test/test_zpickle.py
--- a/pypy/module/_continuation/test/test_zpickle.py
+++ b/pypy/module/_continuation/test/test_zpickle.py
@@ -1,11 +1,8 @@
-from pypy.conftest import gettestobjspace
-
class AppTestCopy:
- def setup_class(cls):
- cls.space = gettestobjspace(usemodules=('_continuation',),
- CALL_METHOD=True)
- cls.space.config.translation.continuation = True
+ spaceconfig = dict(usemodules=['_continuation'],
+ continuation=True,
+ CALL_METHOD=True)
def test_basic_setup(self):
from _continuation import continulet
@@ -104,11 +101,11 @@
class AppTestPickle:
version = 0
+ spaceconfig = dict(usemodules=['_continuation', 'struct'],
+ continuation=True,
+ CALL_METHOD=True)
def setup_class(cls):
- cls.space = gettestobjspace(usemodules=('_continuation', 'struct'),
- CALL_METHOD=True)
- cls.space.config.translation.continuation = True
cls.space.appexec([], """():
global continulet, A, __name__
diff --git a/pypy/module/clr/test/test_clr.py b/pypy/module/clr/test/test_clr.py
--- a/pypy/module/clr/test/test_clr.py
+++ b/pypy/module/clr/test/test_clr.py
@@ -1,4 +1,3 @@
-from pypy.conftest import gettestobjspace
from pypy.module.clr.assemblyname import mscorlib
def skip_if_not_pythonnet():
@@ -11,10 +10,10 @@
skip_if_not_pythonnet()
class AppTestDotnet:
+ spaceconfig = dict(usemodules=('clr',))
+
def setup_class(cls):
- space = gettestobjspace(usemodules=('clr',))
- cls.space = space
- cls.w_mscorlib = space.wrap(mscorlib)
+ cls.w_mscorlib = cls.space.wrap(mscorlib)
def test_cliobject(self):
import clr
diff --git a/pypy/module/clr/test/test_importer.py
b/pypy/module/clr/test/test_importer.py
--- a/pypy/module/clr/test/test_importer.py
+++ b/pypy/module/clr/test/test_importer.py
@@ -1,12 +1,9 @@
-from pypy.conftest import gettestobjspace
from pypy.module.clr.test.test_clr import skip_if_not_pythonnet
skip_if_not_pythonnet()
class AppTestDotnet:
- def setup_class(cls):
- space = gettestobjspace(usemodules=('clr', ))
- cls.space = space
+ spaceconfig = dict(usemodules=('clr',))
def test_list_of_namespaces_and_classes(self):
import clr
diff --git a/pypy/module/cmath/test/test_cmath.py
b/pypy/module/cmath/test/test_cmath.py
--- a/pypy/module/cmath/test/test_cmath.py
+++ b/pypy/module/cmath/test/test_cmath.py
@@ -1,5 +1,4 @@
from __future__ import with_statement
-from pypy.conftest import gettestobjspace
from pypy.rlib.rfloat import copysign, isnan, isinf
from pypy.module.cmath import interp_cmath
import os, sys, math
@@ -16,8 +15,7 @@
class AppTestCMath:
- def setup_class(cls):
- cls.space = gettestobjspace(usemodules=['cmath'])
+ spaceconfig = dict(usemodules=['cmath'])
def test_sign(self):
import math
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
