aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorholger krekel <holger@merlinux.eu>2011-04-28 17:36:28 +0200
committerholger krekel <holger@merlinux.eu>2011-04-28 17:36:28 +0200
commit5be2e48cfd19937177b8967fca4864d4aa14b6e2 (patch)
treeab4eeae369b009a1e010d78e9cdc562234fc7637 /_pytest/config.py
parentadd the possibility to ignore the matching of arguments (diff)
downloadpypy-5be2e48cfd19937177b8967fca4864d4aa14b6e2.tar.gz
pypy-5be2e48cfd19937177b8967fca4864d4aa14b6e2.tar.bz2
pypy-5be2e48cfd19937177b8967fca4864d4aa14b6e2.zip
use actually released pytest-2.0.3 / py-1.4.3 versions
(minor fixes compared to the versions pypy already used)
Diffstat (limited to '_pytest/config.py')
-rw-r--r--_pytest/config.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/_pytest/config.py b/_pytest/config.py
index 79a26afb4a..6e0cfea1a3 100644
--- a/_pytest/config.py
+++ b/_pytest/config.py
@@ -12,6 +12,10 @@ def pytest_cmdline_parse(pluginmanager, args):
config.trace.root.setwriter(sys.stderr.write)
return config
+def pytest_unconfigure(config):
+ for func in config._cleanup:
+ func()
+
class Parser:
""" Parser for command line arguments. """
@@ -251,7 +255,8 @@ class Config(object):
self._conftest = Conftest(onimport=self._onimportconftest)
self.hook = self.pluginmanager.hook
self._inicache = {}
-
+ self._cleanup = []
+
@classmethod
def fromdictargs(cls, option_dict, args):
""" constructor useable for subprocesses. """