floraachy
/
pytest2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chage collections.abc import to fix deprecation warnings on python 3.7

This commit is contained in:
Irmen de Jong 2018-03-29 20:02:00 +02:00
parent f1c9efc358
commit faded25ee8
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
_pytest/assertion/util.py
View File

@ -5,7 +5,11 @@ import pprint
import _pytest._code import _pytest._code
import py import py
import six 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 u = six.text_type

7
_pytest/mark/structures.py
View File

@ -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 import warnings
from operator import attrgetter from operator import attrgetter
import inspect import inspect