Merge pull request #21628 from edx/BOM-405

BOM-405
2019-09-13 16:21:05 +05:00
parent 89c57a636a f0a16d2aea
commit aeecabbe0d
1 changed files with 2 additions and 6 deletions
--- a/openedx/core/djangolib/js_utils.py
+++ b/openedx/core/djangolib/js_utils.py
@@ -69,12 +69,8 @@ def dump_js_escaped_json(obj, cls=EdxJSONEncoder):
        (string) Escaped encoded JSON.

    """
-    try:
-        json_string = json.dumps(obj, ensure_ascii=True, cls=cls)
-    except:  # pylint: disable=bare-except
-        # in some cases dict_values appear here.
-        json_string = json.dumps(list(obj), ensure_ascii=True, cls=cls)
-
+    obj = list(obj) if isinstance(obj, type({}.values())) else obj
+    json_string = json.dumps(obj, ensure_ascii=True, cls=cls)
    json_string = _escape_json_for_js(json_string)
    return json_string