Skip to content

deprecated_call does not revert warning functions back to original v2 #803

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nicoddemus merged 3 commits into from
Jun 26, 2015
Merged

deprecated_call does not revert warning functions back to original v2 #803

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
89b00d7
deprecated_call dit not revert functions back to original
pieterproigia Jun 25, 2015
444cdfe
Correct test_deprecated_call_preserves test.
pieterproigia Jun 25, 2015
75679f0
Update AUTHORS and CHANGELOG
pieterproigia Jun 25, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions AUTHORS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ Marc Schlaich
Mark Abramowitz
Martijn Faassen
Nicolas Delaby
Pieter Mulder
Piotr Banaszkiewicz
Punyashloka Biswal
Ralf Schmitt
Expand Down
2 changes: 2 additions & 0 deletions CHANGELOG
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
2.7.2 (compared to 2.7.1)
-----------------------------

- preserve warning functions after call to pytest.deprecated_call
Copy link
Member

@nicoddemus nicoddemus Jun 25, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you add a "Thanks Pieter Mulder for PR." to the end, as we usually do with the other entries. Thanks


- fix issue767: pytest.raises value attribute does not contain the exception
instance on Python 2.6. Thanks Eric Siegerman for providing the test
case and Bruno Oliveira for PR.
Expand Down
4 changes: 2 additions & 2 deletions _pytest/recwarn.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ def warn(*args, **kwargs):
try:
ret = func(*args, **kwargs)
finally:
warnings.warn_explicit = warn_explicit
warnings.warn = warn
warnings.warn_explicit = oldwarn_explicit
warnings.warn = oldwarn
if not l:
__tracebackhide__ = True
raise AssertionError("%r did not produce DeprecationWarning" %(func,))
Expand Down
8 changes: 4 additions & 4 deletions testing/test_recwarn.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,12 +64,12 @@ def test_deprecated_call_ret():
assert ret == 42

def test_deprecated_call_preserves():
r = py.std.warnings.onceregistry.copy()
f = py.std.warnings.filters[:]
warn = py.std.warnings.warn
warn_explicit = py.std.warnings.warn_explicit
test_deprecated_call_raises()
test_deprecated_call()
assert r == py.std.warnings.onceregistry
assert f == py.std.warnings.filters
assert warn == py.std.warnings.warn
assert warn_explicit == py.std.warnings.warn_explicit

def test_deprecated_explicit_call_raises():
pytest.raises(AssertionError,
Expand Down