[py-svn] r36233 - py/dist/py/test/rsession

[fijal at codespeak.net]

Author: fijal
Date: Mon Jan  8 11:25:39 2007
New Revision: 36233

Modified:
   py/dist/py/test/rsession/rsession.py
Log:
Kill some dead code.


Modified: py/dist/py/test/rsession/rsession.py
==============================================================================
--- py/dist/py/test/rsession/rsession.py	(original)
+++ py/dist/py/test/rsession/rsession.py	Mon Jan  8 11:25:39 2007
@@ -247,9 +247,7 @@
         
         if runner is None and self.config.option.apigen:
             from py.__.apigen.tracer.tracer import Tracer
-            # XXX
             module = py
-            #module = __import__(str(pkgdir.join('__init__.py')))
             try:
                 self.docstorage = self.config.getinitialvalue('ApiGen').get_doc_storage()
             except (ValueError, AttributeError):
@@ -257,24 +255,13 @@
                     "way of generating DocStorage")
             self.tracer = Tracer(self.docstorage)
             runner = apigen_runner
-        #elif runner is None and (self.config.option.usepdb or self.config.option.nocapture):
-        #    runner = plain_runner
-        #elif runner is None:
-        #    runner = box_runner
+
         elif runner is None:
             runner = RunnerPolicy[session_options.runner_policy]
 
         keyword = self.config.option.keyword
 
-        def itemgen():
-            for x in colitems: 
-                for y in x.tryiter(reporterror = lambda x: self.reporterror(reporter, x), keyword = keyword):
-                    yield y 
-        
-        itemgenerator = itemgen() 
-        #assert 0, "\n".join([",".join(x.listnames()) for x in 
-        #    list(itemgenerator)])
-        # XXX: We have to decide which runner to use at this point
+        itemgenerator = itemgen(colitems, reporter, keyword, self.reporterror)
         local_loop(self, reporter, itemgenerator, checkfun, self.config, runner=runner)
         
         retval = reporter(report.TestFinished())
@@ -282,7 +269,6 @@
             from py.__.test.rsession.web import kill_server
             kill_server()
 
-        #py.test.Function.state.teardown_all()
         if not self.config.option.nomagic:
             py.magic.revoke(assertion=1)