From 5072226f69ce7bb2fedd091d3e84cb40fac390ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
Date: Tue, 22 May 2018 21:58:31 +0200
Subject: [PATCH] Import Mapping and Sequence from compat in python_api::approx

Related to https://github.com/pytest-dev/pytest/issues/3339

Fixes a DeprecationWarning on Python 3.7

Adds Mapping to compat
---
 AUTHORS                    | 1 +
 _pytest/compat.py          | 4 ++--
 _pytest/python_api.py      | 2 +-
 changelog/3497.trivial.rst | 5 +++++
 4 files changed, 9 insertions(+), 3 deletions(-)
 create mode 100644 changelog/3497.trivial.rst

diff --git a/AUTHORS b/AUTHORS
index 2068a3612..b7765e481 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -144,6 +144,7 @@ Michael Seifert
 Michal Wajszczuk
 Mihai Capotă
 Mike Lundy
+Miro Hrončok
 Nathaniel Waisbrot
 Ned Batchelder
 Neven Mundar
diff --git a/_pytest/compat.py b/_pytest/compat.py
index e5c8c3940..abad4f3c5 100644
--- a/_pytest/compat.py
+++ b/_pytest/compat.py
@@ -40,11 +40,11 @@ MODULE_NOT_FOUND_ERROR = 'ModuleNotFoundError' if PY36 else 'ImportError'
 
 if _PY3:
     from collections.abc import MutableMapping as MappingMixin  # noqa
-    from collections.abc import Sequence  # noqa
+    from collections.abc import Mapping, Sequence  # noqa
 else:
     # those raise DeprecationWarnings in Python >=3.7
     from collections import MutableMapping as MappingMixin  # noqa
-    from collections import Sequence  # noqa
+    from collections import Mapping, Sequence  # noqa
 
 
 def _format_args(func):
diff --git a/_pytest/python_api.py b/_pytest/python_api.py
index 8e09a4a6f..838a4a50c 100644
--- a/_pytest/python_api.py
+++ b/_pytest/python_api.py
@@ -426,7 +426,7 @@ def approx(expected, rel=None, abs=None, nan_ok=False):
        __ https://docs.python.org/3/reference/datamodel.html#object.__ge__
     """
 
-    from collections import Mapping, Sequence
+    from _pytest.compat import Mapping, Sequence
     from _pytest.compat import STRING_TYPES as String
     from decimal import Decimal
 
diff --git a/changelog/3497.trivial.rst b/changelog/3497.trivial.rst
new file mode 100644
index 000000000..c7aca0ec3
--- /dev/null
+++ b/changelog/3497.trivial.rst
@@ -0,0 +1,5 @@
+Import ``Mapping`` and ``Sequence`` from ``_pytest.compat`` instead of directly
+from ``collections`` in ``python_api.py::approx``. Add ``Mapping`` to
+``_pytest.compat``, import it from ``collections`` on python 2, but from
+``collections.abc`` on Python 3 to avoid a ``DeprecationWarning`` on
+Python 3.7 or newer.