Merge remote-tracking branch 'upstream/master' into merge-master-into-features

2019-01-29 19:36:56 -02:00
parent 3e0e819158 5119abe498
commit ade5f2c8c5
48 changed files with 468 additions and 144 deletions
--- a/src/_pytest/python.py
+++ b/src/_pytest/python.py
@@ -1029,7 +1029,7 @@ class Metafunc(fixtures.FuncargnamesCompatAttr):
        :rtype: List[str]
        :return: the list of ids for each argname given
        """
-        from py.io import saferepr
+        from _pytest._io.saferepr import saferepr

        idfn = None
        if callable(ids):