diff options
| author | Andras Becsi <andras.becsi@digia.com> | 2013-12-11 21:33:03 +0100 |
|---|---|---|
| committer | Andras Becsi <andras.becsi@digia.com> | 2013-12-13 12:34:07 +0100 |
| commit | f2a33ff9cbc6d19943f1c7fbddd1f23d23975577 (patch) | |
| tree | 0586a32aa390ade8557dfd6b4897f43a07449578 /chromium/tools/json_schema_compiler/json_parse.py | |
| parent | 5362912cdb5eea702b68ebe23702468d17c3017a (diff) | |
| download | qtwebengine-chromium-f2a33ff9cbc6d19943f1c7fbddd1f23d23975577.tar.gz | |
Update Chromium to branch 1650 (31.0.1650.63)
Change-Id: I57d8c832eaec1eb2364e0a8e7352a6dd354db99f
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Diffstat (limited to 'chromium/tools/json_schema_compiler/json_parse.py')
| -rw-r--r-- | chromium/tools/json_schema_compiler/json_parse.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chromium/tools/json_schema_compiler/json_parse.py b/chromium/tools/json_schema_compiler/json_parse.py index 9502e91d5c2..21a5a8f6c59 100644 --- a/chromium/tools/json_schema_compiler/json_parse.py +++ b/chromium/tools/json_schema_compiler/json_parse.py @@ -3,7 +3,6 @@ # found in the LICENSE file. import json -import logging import os import sys @@ -57,5 +56,6 @@ except ImportError: return simplejson.loads(json_comment_eater.Nom(json_str), object_pairs_hook=OrderedDict) + def IsDict(item): return isinstance(item, (dict, OrderedDict)) |