[py-svn] r61722 - in py/branch/pytestplugin: contrib/py_unittest py/test

[hpk at codespeak.net]

Author: hpk
Date: Wed Feb 11 13:20:59 2009
New Revision: 61722

Removed:
   py/branch/pytestplugin/contrib/py_unittest/
Modified:
   py/branch/pytestplugin/py/test/pycollect.py
Log:
61721 was missing this: inokve the plugin hook
and remove the original py_unittest conftest approach 
from contrib 


Modified: py/branch/pytestplugin/py/test/pycollect.py
==============================================================================
--- py/branch/pytestplugin/py/test/pycollect.py	(original)
+++ py/branch/pytestplugin/py/test/pycollect.py	Wed Feb 11 13:20:59 2009
@@ -137,6 +137,10 @@
             return self.join(name)
 
     def makeitem(self, name, obj, usefilters=True):
+        res = self._config.pluginmanager.callfirst(
+            "pytest_pymodule_makeitem", modcol=self, name=name, obj=obj)
+        if res is not None:
+            return res
         if (not usefilters or self.classnamefilter(name)) and \
             py.std.inspect.isclass(obj):
             res = self._deprecated_join(name)