[pypy-svn] r66776 - in pypy/branch/use-py1.0.0/pypy: . doc

[pedronis at codespeak.net]

Author: pedronis
Date: Tue Aug 11 14:03:35 2009
New Revision: 66776

Modified:
   pypy/branch/use-py1.0.0/pypy/conftest.py
   pypy/branch/use-py1.0.0/pypy/doc/conftest.py
Log:
adapt contests

Modified: pypy/branch/use-py1.0.0/pypy/conftest.py
==============================================================================
--- pypy/branch/use-py1.0.0/pypy/conftest.py	(original)
+++ pypy/branch/use-py1.0.0/pypy/conftest.py	Tue Aug 11 14:03:35 2009
@@ -29,25 +29,22 @@
 
 option = py.test.config.option
 
-class PyPyTestPlugin:
-    def pytest_addoption(self, parser):
-        group = parser.addgroup("pypy options")
-        group.addoption('--view', action="store_true", dest="view", default=False,
-               help="view translation tests' flow graphs with Pygame")
-        group.addoption('-A', '--runappdirect', action="store_true",
-               default=False, dest="runappdirect",
-               help="run applevel tests directly on python interpreter (not through PyPy)")
-        group.addoption('--direct', action="store_true",
-               default=False, dest="rundirect",
-               help="run pexpect tests directly")
-        group.addoption('-P', '--platform', action="callback", type="string",
-               default="host", callback=_set_platform,
-               help="set up tests to use specified platform as compile/run target")
-
-    def pytest_funcarg__space(self, pyfuncitem):
-        return gettestobjspace()
-        
-ConftestPlugin = PyPyTestPlugin
+def pytest_addoption(parser):
+    group = parser.addgroup("pypy options")
+    group.addoption('--view', action="store_true", dest="view", default=False,
+           help="view translation tests' flow graphs with Pygame")
+    group.addoption('-A', '--runappdirect', action="store_true",
+           default=False, dest="runappdirect",
+           help="run applevel tests directly on python interpreter (not through PyPy)")
+    group.addoption('--direct', action="store_true",
+           default=False, dest="rundirect",
+           help="run pexpect tests directly")
+    group.addoption('-P', '--platform', action="callback", type="string",
+           default="host", callback=_set_platform,
+           help="set up tests to use specified platform as compile/run target")
+
+def pytest_funcarg__space(request):
+    return gettestobjspace()
 
 _SPACECACHE={}
 def gettestobjspace(name=None, **kwds):

Modified: pypy/branch/use-py1.0.0/pypy/doc/conftest.py
==============================================================================
--- pypy/branch/use-py1.0.0/pypy/doc/conftest.py	(original)
+++ pypy/branch/use-py1.0.0/pypy/doc/conftest.py	Tue Aug 11 14:03:35 2009
@@ -5,28 +5,25 @@
 
 pytest_plugins = "pytest_restdoc"
 
-class PyPyDocPlugin:
-    def pytest_addoption(self, parser):
-        group = parser.addgroup("pypy-doc options")
-        group.addoption('--pypy-doctests', action="store_true",
-               dest="pypy_doctests", default=False, 
-               help="enable doctests in .txt files")
-        group.addoption('--generate-redirections',
-            action="store_true", dest="generateredirections",
-            default=True, help="Generate redirecting HTML files")
+def pytest_addoption(parser):
+    group = parser.addgroup("pypy-doc options")
+    group.addoption('--pypy-doctests', action="store_true",
+           dest="pypy_doctests", default=False, 
+           help="enable doctests in .txt files")
+    group.addoption('--generate-redirections',
+        action="store_true", dest="generateredirections",
+        default=True, help="Generate redirecting HTML files")
 
-    def pytest_configure(self, config):
-        self.config = config 
-        register_config_role(docdir)
-    
-    def pytest_doctest_prepare_content(self, content):
-        if not self.config.getvalue("pypy_doctests"):
-            py.test.skip("specify --pypy-doctests to run doctests")
-        l = []
-        for line in content.split("\n"):
-            if line.find('>>>>') != -1: 
-                line = "" 
-            l.append(line) 
-        return "\n".join(l) 
+def pytest_configure(config):
+    register_config_role(docdir)
+
+def pytest_doctest_prepare_content(content):
+    if not py.test.config.getvalue("pypy_doctests"):
+        py.test.skip("specify --pypy-doctests to run doctests")
+    l = []
+    for line in content.split("\n"):
+        if line.find('>>>>') != -1: 
+            line = "" 
+        l.append(line) 
+    return "\n".join(l) 
 
-ConftestPlugin = PyPyDocPlugin