diff options
| author | yzshen@chromium.org <yzshen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-10 16:48:46 +0000 |
|---|---|---|
| committer | yzshen@chromium.org <yzshen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-10 16:48:46 +0000 |
| commit | 6ead4986719210cdf84810ff5da5126ce72a7fd3 (patch) | |
| tree | 6d9605b7271b055f4edfd5559b8d325109894c9f /tools/json_schema_compiler/json_schema.py | |
| parent | 6dc1e1096c14e1ecae49183346134ebcab94c884 (diff) | |
| download | chromium_src-6ead4986719210cdf84810ff5da5126ce72a7fd3.zip chromium_src-6ead4986719210cdf84810ff5da5126ce72a7fd3.tar.gz chromium_src-6ead4986719210cdf84810ff5da5126ce72a7fd3.tar.bz2 | |
Revert 136296 - Make all extension api types fully qualified.
BUG=123073
TEST= (unit_tests --gtest_filter=ExtensionAPI) && (browser_tests --gtest_filter=ExtensionApiTest)
Review URL: https://chromiumcodereview.appspot.com/10367002
TBR=bryeung@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10381089
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@136323 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools/json_schema_compiler/json_schema.py')
| -rw-r--r-- | tools/json_schema_compiler/json_schema.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/tools/json_schema_compiler/json_schema.py b/tools/json_schema_compiler/json_schema.py index 636f837..f51cece 100644 --- a/tools/json_schema_compiler/json_schema.py +++ b/tools/json_schema_compiler/json_schema.py @@ -10,7 +10,6 @@ import sys _script_path = os.path.realpath(__file__) sys.path.insert(0, os.path.normpath(_script_path + "/../../")) import json_comment_eater -import schema_util def DeleteNocompileNodes(item): def HasNocompile(thing): @@ -33,10 +32,9 @@ def DeleteNocompileNodes(item): def Load(filename): with open(filename, 'r') as handle: - schemas = DeleteNocompileNodes( + return DeleteNocompileNodes( json.loads(json_comment_eater.Nom(handle.read()))) - schema_util.PrefixSchemasWithNamespace(schemas) - return schemas + # A dictionary mapping |filename| to the object resulting from loading the JSON # at |filename|. |