Merge pull request RasaHQ#5861 from Archish27/common-utils-warnings

Updated stack level for FutureWarnings

Author: ricwo

changelog/5385.bugfix.rst

@@ -0,0 +1 @@
+Stack level for ``FutureWarning`` updated to level 2.

rasa/utils/common.py

@@ -357,10 +357,8 @@ def formatwarning(
         # try to set useful defaults for the most common warning categories
         if category == DeprecationWarning:
             kwargs["stacklevel"] = 3
-        elif category == UserWarning:
+        elif category in (UserWarning, FutureWarning):
             kwargs["stacklevel"] = 2
-        elif category == FutureWarning:
-            kwargs["stacklevel"] = 3
 
     warnings.formatwarning = formatwarning
     warnings.warn(message, category=category, **kwargs)

tests/utils/test_common.py

@@ -12,14 +12,22 @@ def test_sort_dicts_by_keys():
     assert actual == expected
 
 
-def test_raise_warning():
+def test_raise_user_warning():
     with pytest.warns(UserWarning) as record:
         raise_warning("My warning.")
 
     assert len(record) == 1
     assert record[0].message.args[0] == "My warning."
 
 
+def test_raise_future_warning():
+    with pytest.warns(FutureWarning) as record:
+        raise_warning("My future warning.", FutureWarning)
+
+    assert len(record) == 1
+    assert record[0].message.args[0] == "My future warning."
+
+
 def test_raise_deprecation():
     with pytest.warns(DeprecationWarning) as record:
         raise_warning("My warning.", DeprecationWarning)