[Pytest-commit] commit/pytest: hpk42: fix issue490: include pytest_load_initial_conftests in documentation

[commits-noreply at bitbucket.org]

1 new commit in pytest:

https://bitbucket.org/hpk42/pytest/commits/f750c24d6b3f/
Changeset:   f750c24d6b3f
User:        hpk42
Date:        2014-03-25 14:43:58
Summary:     fix issue490: include pytest_load_initial_conftests in documentation
and improve docstring.
Affected #:  3 files

diff -r 585fe9c5488e8e7bd4a8048aeb578b95c5dc0b32 -r f750c24d6b3fe7f6e5c5f8e256b22e34e3d10e09 CHANGELOG
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -15,6 +15,9 @@
   during collection/loading of test modules.  Thanks to Marc Schlaich
   for the complete PR.
 
+- fix issue490: include pytest_load_initial_conftests in documentation
+  and improve docstring.
+
 
 2.5.2
 -----------------------------------

diff -r 585fe9c5488e8e7bd4a8048aeb578b95c5dc0b32 -r f750c24d6b3fe7f6e5c5f8e256b22e34e3d10e09 _pytest/hookspec.py
--- a/_pytest/hookspec.py
+++ b/_pytest/hookspec.py
@@ -53,8 +53,8 @@
 pytest_cmdline_main.firstresult = True
 
 def pytest_load_initial_conftests(args, early_config, parser):
-    """ implements loading initial conftests.
-    """
+    """ implements the loading of initial conftest files ahead
+    of command line option parsing. """
 
 def pytest_configure(config):
     """ called after command line options have been parsed

diff -r 585fe9c5488e8e7bd4a8048aeb578b95c5dc0b32 -r f750c24d6b3fe7f6e5c5f8e256b22e34e3d10e09 doc/en/plugins.txt
--- a/doc/en/plugins.txt
+++ b/doc/en/plugins.txt
@@ -309,6 +309,7 @@
 
 .. currentmodule:: _pytest.hookspec
 
+.. autofunction:: pytest_load_initial_conftests
 .. autofunction:: pytest_cmdline_preparse
 .. autofunction:: pytest_cmdline_parse
 .. autofunction:: pytest_namespace

Repository URL: https://bitbucket.org/hpk42/pytest/

--

This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.