we only support python 3.9+

Author: oliverb123

posthog/scopes.py

@@ -1,31 +1,12 @@
-import sys
-import threading
+import contextvars
 from contextlib import contextmanager
 from typing import Any, Callable, Dict, TypeVar, cast
 
-# Use contextvars if available (Python 3.7+), otherwise fall back to threading.local
-if sys.version_info >= (3, 7):
-    import contextvars
-
-    _context_stack: contextvars.ContextVar[list] = contextvars.ContextVar("posthog_context_stack", default=[{}])
-    _use_contextvars = True
-else:
-    _use_contextvars = False
-
-_scopes_local = threading.local()
-
-
-def _init_guard() -> None:
-    if not _use_contextvars and not hasattr(_scopes_local, "context_stack"):
-        _scopes_local.context_stack = [{}]
+_context_stack: contextvars.ContextVar[list] = contextvars.ContextVar("posthog_context_stack", default=[{}])
 
 
 def _get_current_context() -> Dict[str, Any]:
-    if _use_contextvars:
-        return _context_stack.get()[-1]
-    else:
-        _init_guard()
-        return _scopes_local.context_stack[-1]
+    return _context_stack.get()[-1]
 
 
 @contextmanager
@@ -53,22 +34,13 @@ def new_context():
                 posthog.capture_exception(e)
                 raise e
     """
-    if _use_contextvars:
-        current_stack = _context_stack.get()
-        new_stack = current_stack + [{}]
-        token = _context_stack.set(new_stack)
-        try:
-            yield
-        finally:
-            _context_stack.reset(token)
-    else:
-        _init_guard()
-        _scopes_local.context_stack.append({})
-        try:
-            yield
-        finally:
-            if len(_scopes_local.context_stack) > 1:
-                _scopes_local.context_stack.pop()
+    current_stack = _context_stack.get()
+    new_stack = current_stack + [{}]
+    token = _context_stack.set(new_stack)
+    try:
+        yield
+    finally:
+        _context_stack.reset(token)
 
 
 def tag(key: str, value: Any) -> None: