Skip to content

Commit

Permalink
Merge pull request #2958 from nicoddemus/issue-2956
Browse files Browse the repository at this point in the history
Only escape str-like arguments passed to warnings
  • Loading branch information
RonnyPfannschmidt authored Nov 28, 2017
2 parents d95c8a2 + 796db80 commit 9f7ba00
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 1 deletion.
4 changes: 3 additions & 1 deletion _pytest/warnings.py
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,9 @@ def catch_warnings_for_item(item):
unicode_warning = False

if compat._PY2 and any(isinstance(m, compat.UNICODE_TYPES) for m in warn_msg.args):
new_args = [compat.ascii_escaped(m) for m in warn_msg.args]
new_args = []
for m in warn_msg.args:
new_args.append(compat.ascii_escaped(m) if isinstance(m, compat.UNICODE_TYPES) else m)
unicode_warning = list(warn_msg.args) != new_args
warn_msg.args = new_args

Expand Down
1 change: 1 addition & 0 deletions changelog/2956.bugfix
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix regression with warnings that contained non-strings in their arguments in Python 2.
13 changes: 13 additions & 0 deletions testing/test_warnings.py
Original file line number Diff line number Diff line change
Expand Up @@ -243,3 +243,16 @@ def test_show_warning():
""")
result = testdir.runpytest('-W always' if default_config == 'cmdline' else '')
result.stdout.fnmatch_lines(['*= 1 failed, 2 passed, 1 warnings in *'])


def test_non_string_warning_argument(testdir):
"""Non-str argument passed to warning breaks pytest (#2956)"""
testdir.makepyfile("""
import warnings
import pytest
def test():
warnings.warn(UserWarning(1, u'foo'))
""")
result = testdir.runpytest('-W', 'always')
result.stdout.fnmatch_lines(['*= 1 passed, 1 warnings in *'])

0 comments on commit 9f7ba00

Please sign in to comment.