diff options
| author | kinaba@chromium.org <kinaba@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-31 06:38:29 +0000 |
|---|---|---|
| committer | kinaba@chromium.org <kinaba@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-31 06:38:29 +0000 |
| commit | e685143bd7d15b048b7ca9cb4ec0240827842266 (patch) | |
| tree | 74f100269c45c656a554a794d4e63749b91fe026 /tools/json_schema_compiler/idl_schema.py | |
| parent | 7a29680b81b983ac1da1b5fdbe3ad096bad7015a (diff) | |
| download | chromium_src-e685143bd7d15b048b7ca9cb4ec0240827842266.zip chromium_src-e685143bd7d15b048b7ca9cb4ec0240827842266.tar.gz chromium_src-e685143bd7d15b048b7ca9cb4ec0240827842266.tar.bz2 | |
Revert 231982 "Docserver: Display enum value descriptions in API..."
"JsonSchemaTest.TestEnum" started failing on Windows bot after this change.
> Docserver: Display enum value descriptions in API docs.
>
> This modifies the json schema to allow both primitive types and
> dictionaries with properties "name" and optional "description" for enum
> values.
>
> BUG=310454
>
> Review URL: https://codereview.chromium.org/39113003
TBR=sammc@chromium.org
Review URL: https://codereview.chromium.org/47403003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@232016 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools/json_schema_compiler/idl_schema.py')
| -rw-r--r-- | tools/json_schema_compiler/idl_schema.py | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/tools/json_schema_compiler/idl_schema.py b/tools/json_schema_compiler/idl_schema.py index 238fb05..e33f8f0 100644 --- a/tools/json_schema_compiler/idl_schema.py +++ b/tools/json_schema_compiler/idl_schema.py @@ -292,13 +292,7 @@ class Enum(object): enum = [] for node in self.node.children: if node.cls == 'EnumItem': - enum_value = {'name': node.GetName()} - for child in node.children: - if child.cls == 'Comment': - enum_value['description'] = ProcessComment(child.GetName())[0] - else: - raise ValueError('Did not process %s %s' % (child.cls, child)) - enum.append(enum_value) + enum.append(node.GetName()) elif node.cls == 'Comment': self.description = ProcessComment(node.GetName())[0] else: |