From 9742f11d37b086750b463e682653123e35a2dbd8 Mon Sep 17 00:00:00 2001 From: Bruno Oliveira Date: Sun, 28 Apr 2019 11:06:47 -0300 Subject: [PATCH 1/2] Removed unused warning message --- src/_pytest/deprecated.py | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/_pytest/deprecated.py b/src/_pytest/deprecated.py index fa7e89364..b65700417 100644 --- a/src/_pytest/deprecated.py +++ b/src/_pytest/deprecated.py @@ -48,12 +48,6 @@ RESULT_LOG = PytestDeprecationWarning( "See https://docs.pytest.org/en/latest/deprecations.html#result-log-result-log for more information." ) -MARK_INFO_ATTRIBUTE = RemovedInPytest4Warning( - "MarkInfo objects are deprecated as they contain merged marks which are hard to deal with correctly.\n" - "Please use node.get_closest_marker(name) or node.iter_markers(name).\n" - "Docs: https://docs.pytest.org/en/latest/mark.html#updating-code" -) - RAISES_EXEC = PytestDeprecationWarning( "raises(..., 'code(as_a_string)') is deprecated, use the context manager form or use `exec()` directly\n\n" "See https://docs.pytest.org/en/latest/deprecations.html#raises-warns-exec" From a3c2ec3c5b7286c26dd2552474b23c171ccef14e Mon Sep 17 00:00:00 2001 From: Bruno Oliveira Date: Sun, 28 Apr 2019 11:10:21 -0300 Subject: [PATCH 2/2] Add CHANGELOG for #5182 --- changelog/5182.trivial.rst | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog/5182.trivial.rst diff --git a/changelog/5182.trivial.rst b/changelog/5182.trivial.rst new file mode 100644 index 000000000..24bd9bd86 --- /dev/null +++ b/changelog/5182.trivial.rst @@ -0,0 +1 @@ +Removed internal and unused ``_pytest.deprecated.MARK_INFO_ATTRIBUTE``.