[py-svn] r56799 - py/branch/event/py/test2

[hpk at codespeak.net]

Author: hpk
Date: Sat Jul 26 16:13:57 2008
New Revision: 56799

Modified:
   py/branch/event/py/test2/genitem.py
Log:
removing unused and untested parameter 


Modified: py/branch/event/py/test2/genitem.py
==============================================================================
--- py/branch/event/py/test2/genitem.py	(original)
+++ py/branch/event/py/test2/genitem.py	Sat Jul 26 16:13:57 2008
@@ -1,14 +1,14 @@
-
 import py
 from py.__.test2 import repevent
+Item = py.test2.collect.Item
+Collector = py.test2.collect.Collector 
 
-def genitems(config, colitems, keywordexpr=None, 
-             stopitems=(py.test2.collect.Item,)):
+def genitems(config, colitems, keywordexpr=None):
     """ yield Items from iterating over the given colitems. """
     bus = config.bus
     while colitems: 
         next = colitems.pop(0)
-        if isinstance(next, stopitems):
+        if isinstance(next, Item):
             if next._skipbykeyword(keywordexpr):
                 bus.notify(repevent.DeselectedTest(next, keywordexpr))
                 if config.option.keyword_oneshot:
@@ -16,7 +16,7 @@
             else:
                 yield next 
         else:
-            assert isinstance(next, py.test2.collect.Collector), next
+            assert isinstance(next, Collector), next
             bus.notify(repevent.CollectionStart(next))
             excinfo = None
             try: