summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authormkwst@chromium.org <mkwst@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-07 19:17:37 +0000
committermkwst@chromium.org <mkwst@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-07 19:17:37 +0000
commitf28b79724b52244bc0dd0e33ef0875827b47aea9 (patch)
tree480deb3e84523ba9c43ae8a40a0ba5339b396fda /tools
parent22eacb7104843f6786a662f8359fcceb6ed3ea24 (diff)
downloadchromium_src-f28b79724b52244bc0dd0e33ef0875827b47aea9.zip
chromium_src-f28b79724b52244bc0dd0e33ef0875827b47aea9.tar.gz
chromium_src-f28b79724b52244bc0dd0e33ef0875827b47aea9.tar.bz2
Fix missing rename of LoadJSON in json_schema_compiler.
BUG= TEST= Review URL: http://codereview.chromium.org/9623004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@125425 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools')
-rwxr-xr-xtools/json_schema_compiler/previewserver.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/json_schema_compiler/previewserver.py b/tools/json_schema_compiler/previewserver.py
index 8a6f6ab..65df25b 100755
--- a/tools/json_schema_compiler/previewserver.py
+++ b/tools/json_schema_compiler/previewserver.py
@@ -11,7 +11,7 @@ import code
import cpp_type_generator
import cpp_util
import h_generator
-from json_schema import LoadJSON
+import json_schema
import model
import optparse
import os
@@ -188,7 +188,7 @@ updateEverything();
try:
# Get main json file
- api_defs = LoadJSON(json_file_path)
+ api_defs = json_schema.Load(json_file_path)
namespace = api_model.AddNamespace(api_defs[0], json_file_path)
if not namespace:
body.Append("<pre>Target file %s is marked nocompile</pre>" %
@@ -200,7 +200,7 @@ updateEverything();
# Get json file depedencies
for dependency in api_defs[0].get('dependencies', []):
json_file_path = os.path.join(filedir, dependency + '.json')
- api_defs = LoadJSON(json_file_path)
+ api_defs = json_schema.Load(json_file_path)
referenced_namespace = api_model.AddNamespace(api_defs[0],
json_file_path)
if referenced_namespace: