Skip to content

Remove transfer_markers #105

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jan 7, 2019
Merged

Remove transfer_markers #105

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c567fb8
Remove transfer_markers
Tadaboody Jan 6, 2019
e868913
Revert "Remove transfer_markers"
Tadaboody Jan 6, 2019
2c8023d
Make transfer_markers a noop when importing fails
Tadaboody Jan 6, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion pytest_asyncio/plugin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,12 @@
import socket

import pytest
from _pytest.python import transfer_markers
try:
from _pytest.python import transfer_markers
except ImportError: # Pytest 4.1.0 removes the transfer_marker api (#104)
def transfer_markers(*args, **kwargs): # noqa
"""Noop when over pytest 4.1.0"""
pass

try:
from async_generator import isasyncgenfunction
Expand Down