Skip to content

Commit 1076a7e

Browse files
authored
Merge pull request #5680 from ss18/ss18/pr0
Fix some typos
2 parents cff5845 + b3f4398 commit 1076a7e

File tree

6 files changed

+7
-7
lines changed

6 files changed

+7
-7
lines changed

doc/en/mark.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ You can register custom marks in your ``pytest.ini`` file like this:
4040
4141
Note that everything after the ``:`` is an optional description.
4242

43-
Alternatively, you can register new markers programatically in a
43+
Alternatively, you can register new markers programmatically in a
4444
:ref:`pytest_configure <initialization-hooks>` hook:
4545

4646
.. code-block:: python

src/_pytest/config/argparsing.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -399,7 +399,7 @@ class DropShorterLongHelpFormatter(argparse.HelpFormatter):
399399
"""shorten help for long options that differ only in extra hyphens
400400
401401
- collapse **long** options that are the same except for extra hyphens
402-
- special action attribute map_long_option allows surpressing additional
402+
- special action attribute map_long_option allows suppressing additional
403403
long options
404404
- shortcut if there are only two options and one of them is a short one
405405
- cache result on action object as this is called at least 2 times

testing/code/test_excinfo.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -370,7 +370,7 @@ def test_excinfo_no_python_sourcecode(tmpdir):
370370
excinfo = pytest.raises(ValueError, template.render, h=h)
371371
for item in excinfo.traceback:
372372
print(item) # XXX: for some reason jinja.Template.render is printed in full
373-
item.source # shouldnt fail
373+
item.source # shouldn't fail
374374
if item.path.basename == "test.txt":
375375
assert str(item.source) == "{{ h()}}:"
376376

testing/test_junitxml.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -582,7 +582,7 @@ def test_hello():
582582
assert "hx" in fnode.toxml()
583583

584584
def test_assertion_binchars(self, testdir):
585-
"""this test did fail when the escaping wasnt strict"""
585+
"""this test did fail when the escaping wasn't strict"""
586586
testdir.makepyfile(
587587
"""
588588
@@ -705,7 +705,7 @@ def getini(self, name):
705705
return "pytest"
706706

707707
junitprefix = None
708-
# XXX: shouldnt need tmpdir ?
708+
# XXX: shouldn't need tmpdir ?
709709
xmlpath = str(tmpdir.join("junix.xml"))
710710
register = gotten.append
711711

testing/test_mark.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -435,7 +435,7 @@ class TestA(object):
435435
def test_b(self):
436436
assert True
437437
class TestC(object):
438-
# this one didnt get marked
438+
# this one didn't get marked
439439
def test_d(self):
440440
assert True
441441
"""

testing/test_nose.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ def test_fun(self):
253253

254254

255255
def test_setup_teardown_linking_issue265(testdir):
256-
# we accidentally didnt integrate nose setupstate with normal setupstate
256+
# we accidentally didn't integrate nose setupstate with normal setupstate
257257
# this test ensures that won't happen again
258258
testdir.makepyfile(
259259
'''

0 commit comments

Comments
 (0)