getsentry
diff --git a/‎sentry_sdk/utils.py
Lines changed: 6 additions & 1 deletion b/‎sentry_sdk/utils.py
Lines changed: 6 additions & 1 deletion
diff --git a/‎tests/test_client.py
Lines changed: 37 additions & 1 deletion b/‎tests/test_client.py
Lines changed: 37 additions & 1 deletion
@@ -372,11 +372,16 @@ def object_to_json(obj, remaining_depth=4, memo=None):
                 ]
 
             if isinstance(obj, Mapping):
+                try:
+                    items = list(obj.items())
+                except Exception:
+                    return u"<broken items>"
+
                 return {
                     safe_str(k): object_to_json(
                         v, remaining_depth=remaining_depth - 1, memo=memo
                     )
-                    for k, v in list(obj.items())
+                    for k, v in items
                 }
 
         return safe_repr(obj)
 
@@ -18,9 +18,18 @@
 )
 from sentry_sdk.hub import HubMeta
 from sentry_sdk.transport import Transport
-from sentry_sdk._compat import reraise, text_type
+from sentry_sdk._compat import reraise, text_type, PY2
 from sentry_sdk.utils import HAS_CHAINED_EXCEPTIONS
 
+if PY2:
+    # Importing ABCs from collections is deprecated, and will stop working in 3.8
+    # https://github.com/python/cpython/blob/master/Lib/collections/__init__.py#L49
+    from collections import Mapping
+else:
+    # New in 3.3
+    # https://docs.python.org/3/library/collections.abc.html
+    from collections.abc import Mapping
+
 
 class EventCaptured(Exception):
     pass
@@ -404,3 +413,30 @@ def test_chained_exceptions(sentry_init, capture_events):
     event, = events
 
     assert len(event["exception"]["values"]) == 2
+
+
+def test_broken_mapping(sentry_init, capture_events):
+    sentry_init()
+    events = capture_events()
+
+    class C(Mapping):
+        def broken(self, *args, **kwargs):
+            raise Exception("broken")
+
+        __getitem__ = broken
+        __setitem__ = broken
+        __delitem__ = broken
+        __iter__ = broken
+        __len__ = broken
+
+    try:
+        a = C()  # noqa
+        1 / 0
+    except Exception:
+        capture_exception()
+
+    event, = events
+    assert (
+        event["exception"]["values"][0]["stacktrace"]["frames"][0]["vars"]["a"]
+        == "<broken items>"
+    )
Original file line number	Diff line number	Diff line change
`@@ -372,11 +372,16 @@ def object_to_json(obj, remaining_depth=4, memo=None):`
`372`	`372`	`]`
`373`	`373`
`374`	`374`	`if isinstance(obj, Mapping):`
	`375`	`+ try:`
	`376`	`+ items = list(obj.items())`
	`377`	`+ except Exception:`
	`378`	`+ return u"<broken items>"`
	`379`	`+`
`375`	`380`	`return {`
`376`	`381`	`safe_str(k): object_to_json(`
`377`	`382`	`v, remaining_depth=remaining_depth - 1, memo=memo`
`378`	`383`	`)`
`379`		`- for k, v in list(obj.items())`
	`384`	`+ for k, v in items`
`380`	`385`	`}`
`381`	`386`
`382`	`387`	`return safe_repr(obj)`