[pypy-svn] r58317 - in pypy/branch/pypy-pytrunk/pypy: . tool/pytest

[pedronis at codespeak.net]

Author: pedronis
Date: Mon Sep 22 14:47:20 2008
New Revision: 58317

Modified:
   pypy/branch/pypy-pytrunk/pypy/conftest.py
   pypy/branch/pypy-pytrunk/pypy/tool/pytest/   (props changed)
Log:
(iko, pedronis)

FileLogSession functionality has been included in py.lib trunk proper



Modified: pypy/branch/pypy-pytrunk/pypy/conftest.py
==============================================================================
--- pypy/branch/pypy-pytrunk/pypy/conftest.py	(original)
+++ pypy/branch/pypy-pytrunk/pypy/conftest.py	Mon Sep 22 14:47:20 2008
@@ -32,10 +32,6 @@
                help="run pexpect tests directly"),
     )
 
-# glue experimental filelog session
-from pypy.tool.pytest.filelog.session import add_filelog_option, FileLogSession
-add_filelog_option()
-
 
 _SPACECACHE={}
 def gettestobjspace(name=None, **kwds):