Skip to content

fix: Make contextvars-detection more readable #574

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
untitaker merged 1 commit into from
Dec 10, 2019
Merged

fix: Make contextvars-detection more readable #574

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 12 additions & 3 deletions sentry_sdk/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -748,12 +748,21 @@ def _get_contextvars():
https://github.com/gevent/gevent/issues/1407
"""
if not _is_threading_local_monkey_patched():
# aiocontextvars is a PyPI package that ensures that the contextvars
# backport (also a PyPI package) works with asyncio under Python 3.6
#
# Import it if available.
if not PY2 and sys.version_info < (3, 7):
try:
from aiocontextvars import ContextVar # noqa

return True, ContextVar
except ImportError:
pass

try:
from contextvars import ContextVar

if not PY2 and sys.version_info < (3, 7):
import aiocontextvars # noqa

return True, ContextVar
except ImportError:
pass
Expand Down