[pypy-svn] r37882 - pypy/branch/pytrunkmerge/pypy

[fijal at codespeak.net]

Author: fijal
Date: Sat Feb  3 19:58:49 2007
New Revision: 37882

Modified:
   pypy/branch/pytrunkmerge/pypy/conftest.py
Log:
Adapt to new interface


Modified: pypy/branch/pytrunkmerge/pypy/conftest.py
==============================================================================
--- pypy/branch/pytrunkmerge/pypy/conftest.py	(original)
+++ pypy/branch/pytrunkmerge/pypy/conftest.py	Sat Feb  3 19:58:49 2007
@@ -218,10 +218,10 @@
 _pygame_imported = False
 
 class IntTestFunction(PyPyTestFunction):
-    def haskeyword(self, keyword):
+    def _haskeyword(self, keyword):
         if keyword == 'interplevel':
             return True 
-        return super(IntTestFunction, self).haskeyword(keyword)
+        return super(IntTestFunction, self)._haskeyword(keyword)
 
     def execute(self, target, *args):
         co = target.func_code
@@ -251,8 +251,8 @@
                                      "if conftest.option.view is False")
 
 class AppTestFunction(PyPyTestFunction): 
-    def haskeyword(self, keyword):
-        return keyword == 'applevel' or super(AppTestFunction, self).haskeyword(keyword)
+    def _haskeyword(self, keyword):
+        return keyword == 'applevel' or super(AppTestFunction, self)._haskeyword(keyword)
 
     def execute(self, target, *args):
         assert not args 
@@ -299,9 +299,9 @@
 class IntClassCollector(PyPyClassCollector): 
     Function = IntTestFunction 
 
-    def haskeyword(self, keyword):
+    def _haskeyword(self, keyword):
         return keyword == 'interplevel' or \
-               super(IntClassCollector, self).haskeyword(keyword)
+               super(IntClassCollector, self)._haskeyword(keyword)
 
 class AppClassInstance(py.test.collect.Instance): 
     Function = AppTestMethod 
@@ -319,12 +319,12 @@
 class AppClassCollector(PyPyClassCollector): 
     Instance = AppClassInstance 
 
-    def haskeyword(self, keyword):
+    def _haskeyword(self, keyword):
         return keyword == 'applevel' or \
-               super(AppClassCollector, self).haskeyword(keyword)
+               super(AppClassCollector, self)._haskeyword(keyword)
 
     def setup(self): 
-        super(AppClassCollector, self).setup()         
+        super(AppClassCollector, self).setup()        
         cls = self.obj 
         space = cls.space 
         clsname = cls.__name__