getsentry · untitaker · Mar 19, 2019 · Mar 16, 2019 · Mar 18, 2019 · Mar 18, 2019
diff --git a/Makefile b/Makefile
@@ -29,7 +29,7 @@ format: .venv
 .PHONY: format
 
 test: .venv
-	@$(VENV_PATH)/bin/tox -e py2.7,py3.7
+	@$(VENV_PATH)/bin/tox -e py2.7,py3.7,py3.6
 .PHONY: test
 
 test-all: .venv

@@ -27,12 +27,11 @@ class AioHttpIntegration(Integration):
     @staticmethod
     def setup_once():
         # type: () -> None
-        if sys.version_info < (3, 7):
+        if sys.version_info < (3, 7) and 'aiocontextvars' not in sys.modules:
             # We better have contextvars or we're going to leak state between
             # requests.
-            raise RuntimeError(
-                "The aiohttp integration for Sentry requires Python 3.7+"
-            )
+            raise RuntimeError("The aiohttp integration for Sentry requires Python 3.7+ "
+                               " or aiocontextvars package")
 
         ignore_logger("aiohttp.server")
 

@@ -34,10 +34,11 @@ class SanicIntegration(Integration):
     @staticmethod
     def setup_once():
         # type: () -> None
-        if sys.version_info < (3, 7):
-            # Sanic is async. We better have contextvars or we're going to leak
-            # state between requests.
-            raise RuntimeError("The sanic integration for Sentry requires Python 3.7+")
+        if sys.version_info < (3, 7) and 'aiocontextvars' not in sys.modules:
+            # We better have contextvars or we're going to leak state between
+            # requests.
+            raise RuntimeError("The sanic integration for Sentry requires Python 3.7+ "
+                               " or aiocontextvars package")
 
         # Sanic 0.8 and older creates a logger named "root" and puts a
         # stringified version of every exception in there (without exc_info),

@@ -867,8 +867,12 @@ def realign_remark(remark):
         value=rv, metadata={"len": rv_original_length, "rem": rv_remarks}
     )
 
-
 try:
+    if not PY2 and sys.version_info < (3, 7):
+        try:
+            import aiocontextvars
+        except ImportError:
+            pass
     from contextvars import ContextVar  # type: ignore
 except ImportError:
     from threading import local

@@ -5,3 +5,4 @@ tox==3.7.0
 Werkzeug==0.14.1
 pytest-localserver==0.4.1
 pytest-cov==2.6.0
+aiocontextvars==0.2.1
@@ -1,3 +1,5 @@
+import sys
+
 import random
 import asyncio
 
@@ -156,7 +158,11 @@ async def task(i):
     async def runner():
         await asyncio.gather(*(task(i) for i in range(1000)))
 
-    asyncio.run(runner())
+    if sys.version_info < (3, 7):
+        loop = asyncio.get_event_loop()
+        loop.run_until_complete(runner())
+    else:
+        asyncio.run(runner())
 
     with configure_scope() as scope:
         assert not scope._tags