[pypy-svn] pypy pytest2: provide dummy conftest.option for early imports because

[hpk42]

Author: holger krekel <holger at merlinux.eu>
Branch: pytest2
Changeset: r40882:a2faa1e6ee5b
Date: 2011-01-18 17:58 +0100
http://bitbucket.org/pypy/pypy/changeset/a2faa1e6ee5b/

Log:	provide dummy conftest.option for early imports because there are
	some places that use getattr(conftest.option, "...", ...)

diff --git a/pypy/conftest.py b/pypy/conftest.py
--- a/pypy/conftest.py
+++ b/pypy/conftest.py
@@ -19,6 +19,8 @@
 # to py.test's standard options)
 #
 
+option = None
+
 def pytest_report_header():
     return "pytest-%s from %s" %(pytest.__version__, pytest.__file__)