Merge branch 'master' into gutenberg2

2019-07-31 14:52:21 -04:00 · 2019-07-31 14:52:21 -04:00 · 159b7a87bc
parent 73179d87e2 58c99d7f57
commit 159b7a87bc
1 changed files with 4 additions and 1 deletions
--- a/diagnostics.py
+++ b/diagnostics.py
@ -44,7 +44,10 @@ def deep_getsizeof(o, ids):
        return r

    if isinstance(o, Mapping):
-        return r + sum(d(k, ids) + d(v, ids) for k, v in o.items())
+        try:
+            return r + sum(d(k, ids) + d(v, ids) for k, v in list(o.items()))
+        except RuntimeError:
+            return 'error'

    if isinstance(o, Container):
        return r + sum(d(x, ids) for x in o)