Fix bug in _update_scope() (getsentry#662)

vasilty · web-flow · commit f49d62009dff · 2020-03-31T14:35:15.000+02:00
Introduced in e680a75
diff --git a/sentry_sdk/hub.py b/sentry_sdk/hub.py
@@ -67,7 +67,7 @@ def _update_scope(base, scope_change, scope_kwargs):
             final_scope.update_from_scope(scope_change)
     elif scope_kwargs:
         final_scope = copy.copy(base)
-        final_scope.update_from_kwargs(scope_kwargs)
+        final_scope.update_from_kwargs(**scope_kwargs)
     else:
         final_scope = base
     return final_scope
diff --git a/tests/test_basics.py b/tests/test_basics.py
@@ -6,6 +6,7 @@
     Client,
     push_scope,
     configure_scope,
+    capture_event,
     capture_exception,
     capture_message,
     add_breadcrumb,
@@ -312,3 +313,12 @@ def bar(event, hint):
     (event,) = events
 
     assert event["message"] == "hifoobarbaz"
+
+
+def test_capture_event_with_scope_kwargs(sentry_init, capture_events):
+    sentry_init(debug=True)
+    events = capture_events()
+    capture_event({}, level="info", extras={"foo": "bar"})
+    (event,) = events
+    assert event["level"] == "info"
+    assert event["extra"]["foo"] == "bar"
