diff options
| author | Paul Ganssle <pganssle@users.noreply.github.com> | 2019-02-02 10:54:06 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-02 10:54:06 -0500 |
| commit | 6c047b2f9e87b9ac9321c0915089c27f4065ff2e (patch) | |
| tree | 878cc5c64d72c9a1e1e3c4ca7bcdabea201791a5 | |
| parent | 6618dee970ec1e5f92e0f48ec74584caf13075aa (diff) | |
| parent | a9f6d7410b0e22d063557e15f1ce291882d4745a (diff) | |
| download | dateutil-6c047b2f9e87b9ac9321c0915089c27f4065ff2e.tar.gz | |
Merge pull request #858 from nicoe/fix-pytest-marker
Fixed get_marker API change introduced by pytest version >= 4.0
| -rw-r--r-- | changelog.d/857.misc.rst | 2 | ||||
| -rw-r--r-- | dateutil/test/conftest.py | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/changelog.d/857.misc.rst b/changelog.d/857.misc.rst new file mode 100644 index 0000000..4ce9135 --- /dev/null +++ b/changelog.d/857.misc.rst @@ -0,0 +1,2 @@ +Fixed issue with get_marker API change introduced by pytest version >= 4.0 +Reported and fixed by @nicoe (gh issue #857, pr #858) diff --git a/dateutil/test/conftest.py b/dateutil/test/conftest.py index 3876b4d..78ed70a 100644 --- a/dateutil/test/conftest.py +++ b/dateutil/test/conftest.py @@ -6,9 +6,11 @@ import pytest # See: https://stackoverflow.com/a/53198349/467366 def pytest_collection_modifyitems(items): for item in items: + marker_getter = getattr(item, 'get_closest_marker', None) + # Python 3.3 support - marker_getter = getattr(item, 'get_closest_marker', - getattr(item, 'get_marker')) + if marker_getter is None: + marker_getter = item.get_marker marker = marker_getter('xfail') |