From faded25ee8821fa16b2a31ea65dee49569d158f8 Mon Sep 17 00:00:00 2001 From: Irmen de Jong Date: Thu, 29 Mar 2018 20:02:00 +0200 Subject: [PATCH] chage collections.abc import to fix deprecation warnings on python 3.7 --- _pytest/assertion/util.py | 6 +++++- _pytest/mark/structures.py | 7 ++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/_pytest/assertion/util.py b/_pytest/assertion/util.py index 5a380ae09..71ad48251 100644 --- a/_pytest/assertion/util.py +++ b/_pytest/assertion/util.py @@ -5,7 +5,11 @@ import pprint import _pytest._code import py import six -from collections import Sequence +import sys +if sys.version_info >= (3, 4): + from collections.abc import Sequence +else: + from collections import Sequence u = six.text_type diff --git a/_pytest/mark/structures.py b/_pytest/mark/structures.py index c56972980..c52fbd277 100644 --- a/_pytest/mark/structures.py +++ b/_pytest/mark/structures.py @@ -1,4 +1,9 @@ -from collections import namedtuple, MutableMapping as MappingMixin +import sys +if sys.version_info >= (3, 4): + from collections.abc import MutableMapping as MappingMixin +else: + from collections import MutableMapping as MappingMixin +from collections import namedtuple import warnings from operator import attrgetter import inspect