fix: Make contextvars-detection more readable (getsentry#574)

untitaker · web-flow · commit 807abc6c02eb · 2019-12-10T23:06:00.000+01:00
diff --git a/sentry_sdk/utils.py b/sentry_sdk/utils.py
@@ -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
