Skip to content

Commit 38e0e08

Browse files
authored
Merge pull request #1751 from javiromero/docstrings
Uppercase first word in docstrings. Change to an imperative form.
2 parents 14af12c + 1aab6e3 commit 38e0e08

File tree

7 files changed

+13
-10
lines changed

7 files changed

+13
-10
lines changed

AUTHORS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,3 +96,4 @@ Tom Viner
9696
Trevor Bekolay
9797
Wouter van Ackooy
9898
Bernard Pratz
99+
Javier Romero

CHANGELOG.rst

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,14 @@
3636
Thanks `@bagerard`_ for reporting (`#1503`_). Thanks to `@davehunt`_ and
3737
`@tomviner`_ for PR.
3838

39-
* Renamed the pytest ``pdb`` module (plugin) into ``debugging``.
39+
* Renamed the pytest ``pdb`` module (plugin) into ``debugging``.
4040

4141
* Improve of the test output for logical expression with brackets.
4242
Fixes(`#925`_). Thanks `@DRMacIver`_ for reporting. Thanks to `@RedBeardCode`_
4343
for PR.
4444

45+
* Updated docstrings with a more uniform style.
46+
4547
*
4648

4749
* ImportErrors in plugins now are a fatal error instead of issuing a

_pytest/capture.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ def suspendcapture_item(self, item, when):
156156

157157
@pytest.fixture
158158
def capsys(request):
159-
"""enables capturing of writes to sys.stdout/sys.stderr and makes
159+
"""Enable capturing of writes to sys.stdout/sys.stderr and make
160160
captured output available via ``capsys.readouterr()`` method calls
161161
which return a ``(out, err)`` tuple.
162162
"""
@@ -167,7 +167,7 @@ def capsys(request):
167167

168168
@pytest.fixture
169169
def capfd(request):
170-
"""enables capturing of writes to file descriptors 1 and 2 and makes
170+
"""Enable capturing of writes to file descriptors 1 and 2 and make
171171
captured output available via ``capfd.readouterr()`` method calls
172172
which return a ``(out, err)`` tuple.
173173
"""

_pytest/junitxml.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -186,8 +186,8 @@ def finalize(self):
186186

187187
@pytest.fixture
188188
def record_xml_property(request):
189-
"""Fixture that adds extra xml properties to the tag for the calling test.
190-
The fixture is callable with (name, value), with value being automatically
189+
"""Add extra xml properties to the tag for the calling test.
190+
The fixture is callable with ``(name, value)``, with value being automatically
191191
xml-encoded.
192192
"""
193193
request.node.warn(

_pytest/monkeypatch.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010

1111
def pytest_funcarg__monkeypatch(request):
12-
"""The returned ``monkeypatch`` funcarg provides these
12+
"""Return a ``monkeypatch`` funcarg providing the following
1313
helper methods to modify objects, dictionaries or os.environ::
1414
1515
monkeypatch.setattr(obj, name, value, raising=True)
@@ -220,10 +220,10 @@ def undo(self):
220220
""" Undo previous changes. This call consumes the
221221
undo stack. Calling it a second time has no effect unless
222222
you do more monkeypatching after the undo call.
223-
223+
224224
There is generally no need to call `undo()`, since it is
225225
called automatically during tear-down.
226-
226+
227227
Note that the same `monkeypatch` fixture is used across a
228228
single test function invocation. If `monkeypatch` is used both by
229229
the test function itself and one of the test fixtures,

_pytest/python.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,7 @@ def pytest_namespace():
271271

272272
@fixture(scope="session")
273273
def pytestconfig(request):
274-
""" the pytest config object with access to command line opts."""
274+
""" The pytest config object with access to command line opts."""
275275
return request.config
276276

277277

_pytest/tmpdir.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ def tmpdir_factory(request):
108108

109109
@pytest.fixture
110110
def tmpdir(request, tmpdir_factory):
111-
"""return a temporary directory path object
111+
"""Return a temporary directory path object
112112
which is unique to each test function invocation,
113113
created as a sub directory of the base temporary
114114
directory. The returned object is a `py.path.local`_

0 commit comments

Comments
 (0)