tools/json_schema_compiler/model.py - Issue 10639020: Switch the downloads API over to IDL/json_schema_compiler

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: tools/json_schema_compiler/model.py

Issue 10639020: Switch the downloads API over to IDL/json_schema_compiler (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: merge Created 8 years, 5 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: tools/json_schema_compiler/model.py

diff --git a/tools/json_schema_compiler/model.py b/tools/json_schema_compiler/model.py

index 63973d43405e939a1416c0b51d339807005d8a16..bb3fe0e9dd2192c17117c5be6c4e18887be2f751 100644

--- a/tools/json_schema_compiler/model.py

+++ b/tools/json_schema_compiler/model.py

@@ -193,7 +193,9 @@ class Property(object):

elif '$ref' in json:

self.ref_type = json['$ref']

self.type_ = PropertyType.REF

- elif 'enum' in json:

+ elif 'enum' in json and json.get('type') == 'string':

+ # Non-string enums (as in the case of [legalValues=(1,2)]) should fall

+ # through to the next elif.

self.enum_values = []

for value in json['enum']:

self.enum_values.append(value)