[py-svn] r38706 - in py/trunk/py/test: . terminal
hpk at codespeak.net
hpk at codespeak.net
Tue Feb 13 16:05:28 CET 2007
Author: hpk
Date: Tue Feb 13 16:05:21 2007
New Revision: 38706
Modified:
py/trunk/py/test/config.py
py/trunk/py/test/terminal/terminal.py
Log:
privatizing config.conftest to config._conftest as well
Modified: py/trunk/py/test/config.py
==============================================================================
--- py/trunk/py/test/config.py (original)
+++ py/trunk/py/test/config.py Tue Feb 13 16:05:21 2007
@@ -32,7 +32,7 @@
self.option = CmdOptions()
self._parser = optparse.OptionParser(
usage="usage: %prog [options] [query] [filenames of tests]")
- self.conftest = Conftest()
+ self._conftest = Conftest()
self._initialized = False
def parse(self, args):
@@ -43,7 +43,7 @@
"can only parse cmdline args once per Config object")
self._initialized = True
adddefaultoptions(self)
- self.conftest.setinitial(args)
+ self._conftest.setinitial(args)
args = [str(x) for x in args]
cmdlineoption, args = self._parser.parse_args(args)
self.option.__dict__.update(vars(cmdlineoption))
@@ -80,7 +80,7 @@
pkgpath = path.pypkgpath()
if pkgpath is None:
pkgpath = path.check(file=1) and path.dirpath() or path
- col = self.conftest.rget("Directory", pkgpath)(pkgpath)
+ col = self._conftest.rget("Directory", pkgpath)(pkgpath)
col._config = self
return col
@@ -94,7 +94,7 @@
return getattr(self.option, name)
except AttributeError:
try:
- mod, relroots = self.conftest.rget_with_confmod(name, path)
+ mod, relroots = self._conftest.rget_with_confmod(name, path)
except KeyError:
return None
modpath = py.path.local(mod.__file__).dirpath()
@@ -132,7 +132,7 @@
try:
return getattr(self.option, name)
except AttributeError:
- return self.conftest.rget(name, path)
+ return self._conftest.rget(name, path)
def initsession(self):
""" return an initialized session object. """
@@ -146,11 +146,11 @@
and looked up in initial config modules.
"""
if self.option.session is not None:
- return self.conftest.rget(self.option.session)
+ return self._conftest.rget(self.option.session)
else:
name = self._getsessionname()
try:
- return self.conftest.rget(name)
+ return self._conftest.rget(name)
except KeyError:
pass
importpath = globals()[name]
@@ -229,8 +229,8 @@
self.__file__ = "<options from remote>"
args, conftestdict, cmdlineopts = repr
self.args = [self.topdir.join(x) for x in args]
- self.conftest.setinitial(self.args)
- self.conftest._path2confmods[None].append(override(conftestdict))
+ self._conftest.setinitial(self.args)
+ self._conftest._path2confmods[None].append(override(conftestdict))
for name, val in cmdlineopts.items():
setattr(self.option, name, val)
Modified: py/trunk/py/test/terminal/terminal.py
==============================================================================
--- py/trunk/py/test/terminal/terminal.py (original)
+++ py/trunk/py/test/terminal/terminal.py Tue Feb 13 16:05:21 2007
@@ -138,7 +138,7 @@
for x in colitems:
self.out.line("test target: %s" %(x.fspath,))
- conftestmodules = self.config.conftest.getconftestmodules(None)
+ conftestmodules = self.config._conftest.getconftestmodules(None)
for i,x in py.builtin.enumerate(conftestmodules):
self.out.line("initial conf %d: %s" %(i, x.__file__))
More information about the pytest-commit
mailing list