Merge pull request #3355 from irmen/py37deprfixes

change collections.abc import to fix deprecation warnings on python 3.7
This commit is contained in:
Bruno Oliveira 2018-04-02 20:31:26 -03:00 committed by GitHub
commit 9a62ebf490
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 15 additions and 6 deletions

View File

@ -5,7 +5,7 @@ import pprint
import _pytest._code
import py
import six
from collections import Sequence
from ..compat import Sequence
u = six.text_type

View File

@ -38,6 +38,14 @@ PY35 = sys.version_info[:2] >= (3, 5)
PY36 = sys.version_info[:2] >= (3, 6)
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
else:
# those raise DeprecationWarnings in Python >=3.7
from collections import MutableMapping as MappingMixin # noqa
from collections import Sequence # noqa
def _format_args(func):
return str(signature(func))

View File

@ -1,13 +1,13 @@
from collections import namedtuple, MutableMapping as MappingMixin
import warnings
from operator import attrgetter
import inspect
import warnings
from collections import namedtuple
from operator import attrgetter
import attr
from ..deprecated import MARK_PARAMETERSET_UNPACKING
from ..compat import NOTSET, getfslineno
from six.moves import map
from ..compat import NOTSET, getfslineno, MappingMixin
from ..deprecated import MARK_PARAMETERSET_UNPACKING
EMPTY_PARAMETERSET_OPTION = "empty_parameter_set_mark"

1
changelog/3339.trivial Normal file
View File

@ -0,0 +1 @@
Import some modules from ``collections`` instead of ``collections.abc`` as the former modules trigger ``DeprecationWarning`` in Python 3.7.