Merge branch 'master' into gutenberg2

gut2-dev
eric 2019-07-31 14:52:21 -04:00
commit 159b7a87bc
1 changed files with 4 additions and 1 deletions

View File

@ -44,7 +44,10 @@ def deep_getsizeof(o, ids):
return r return r
if isinstance(o, Mapping): 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): if isinstance(o, Container):
return r + sum(d(x, ids) for x in o) return r + sum(d(x, ids) for x in o)