From 9f77a8507efe8e5e021c7a65342b2b01aefb6765 Mon Sep 17 00:00:00 2001
From: Galaczi Endre <galacziendre@gmail.com>
Date: Mon, 21 Sep 2015 15:54:50 +0100
Subject: [PATCH] removed mutation of global state, changed filter addition in
 WarningsRecorder

---
 _pytest/recwarn.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/_pytest/recwarn.py b/_pytest/recwarn.py
index a4e2d763c6a..5e7cdd84b3e 100644
--- a/_pytest/recwarn.py
+++ b/_pytest/recwarn.py
@@ -37,7 +37,6 @@ def deprecated_call(func=None, *args, **kwargs):
         ...    myobject.deprecated_method()
     """
     if not func:
-        warnings.simplefilter('always')
         return WarningsChecker(expected_warning=DeprecationWarning)
 
     wrec = WarningsRecorder()
@@ -158,8 +157,8 @@ def showwarning(message, category, filename, lineno,
         self._module.showwarning = showwarning
 
         # allow the same warning to be raised more than once
-        self._module.simplefilter('always', append=True)
 
+        self._module.simplefilter('always')
         return self
 
     def __exit__(self, *exc_info):