# HG changeset patch -- Bitbucket.org
# Project pytest
# URL http://bitbucket.org/hpk42/pytest/overview
# User holger krekel <hol...@merlinux.eu>
# Date 1291721658 -3600
# Node ID febbfb4066a2e909d993ab24123f5f4e7f35fe4d
# Parent 031d0af75303e3bf6af99b1dcea784c113369083
rather named the new hook cmdline_preparse
--- a/doc/example/simple.txt
+++ b/doc/example/simple.txt
@@ -154,7 +154,7 @@ the command line arguments before they g
# content of conftest.py
import sys
- def pytest_cmdline_processargs(args):
+ def pytest_cmdline_preparse(args):
if 'xdist' in sys.modules: # pytest-xdist plugin
import multiprocessing
num = max(multiprocessing.cpu_count() / 2, 1)
--- a/testing/test_config.py
+++ b/testing/test_config.py
@@ -261,7 +261,7 @@ def test_plugin_preparse_prevents_setupt
def test_cmdline_processargs_simple(testdir):
testdir.makeconftest("""
- def pytest_cmdline_processargs(args):
+ def pytest_cmdline_preparse(args):
args.append("-h")
""")
result = testdir.runpytest()
--- a/_pytest/hookspec.py
+++ b/_pytest/hookspec.py
@@ -19,7 +19,7 @@ def pytest_cmdline_parse(pluginmanager,
"""return initialized config object, parsing the specified args. """
pytest_cmdline_parse.firstresult = True
-def pytest_cmdline_processargs(config, args):
+def pytest_cmdline_preparse(config, args):
"""modify command line arguments before option parsing. """
def pytest_addoption(parser):
--- a/doc/plugins.txt
+++ b/doc/plugins.txt
@@ -271,7 +271,7 @@ initialisation, command line and configu
.. currentmodule:: _pytest.hookspec
-.. autofunction:: pytest_cmdline_processargs
+.. autofunction:: pytest_cmdline_preparse
.. autofunction:: pytest_cmdline_parse
.. autofunction:: pytest_namespace
.. autofunction:: pytest_addoption
--- a/_pytest/config.py
+++ b/_pytest/config.py
@@ -306,7 +306,7 @@ class Config(object):
self._setinitialconftest(args)
self.pluginmanager.do_addoption(self._parser)
if addopts:
- self.hook.pytest_cmdline_processargs(config=self, args=args)
+ self.hook.pytest_cmdline_preparse(config=self, args=args)
def _checkversion(self):
minver = self.inicfg.get('minversion', None)
--- a/pytest.py
+++ b/pytest.py
@@ -1,7 +1,7 @@
"""
unit and functional testing with Python.
"""
-__version__ = '2.0.1.dev4'
+__version__ = '2.0.1.dev5'
__all__ = ['main']
from _pytest.core import main, UsageError, _preloadplugins
--- a/setup.py
+++ b/setup.py
@@ -22,7 +22,7 @@ def main():
name='pytest',
description='py.test: simple powerful testing with Python',
long_description = long_description,
- version='2.0.1.dev4',
+ version='2.0.1.dev5',
url='http://pytest.org',
license='MIT license',
platforms=['unix', 'linux', 'osx', 'cygwin', 'win32'],
_______________________________________________
py-svn mailing list
py-svn@codespeak.net
http://codespeak.net/mailman/listinfo/py-svn
