Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Breaking changes: change select options to (key, value) tuple #5

Merged
merged 2 commits into from
Jul 26, 2018
Merged

Breaking changes: change select options to (key, value) tuple #5

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1bccda7
Add better support for vol.In(dict)
awarecan Jul 24, 2018
3073cfa
Change options to (key, value) tuple
awarecan Jul 25, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions tests/test_lib.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,8 @@ def test_in_dict():
assert {
'type': 'select',
'options': [
'en_US', 'zh_CN'
# {'en_US': 'American English'},
# {'zh_CN': 'Chinese (Simplified)'},
{'en_US': 'American English'},
{'zh_CN': 'Chinese (Simplified)'},
],
} == convert(vol.Schema(vol.In(
{'en_US': 'American English', 'zh_CN': 'Chinese (Simplified)'})))
Expand Down
15 changes: 11 additions & 4 deletions voluptuous_serialize/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,10 +72,17 @@ def convert(schema):
}

elif isinstance(schema, vol.In):
return {
'type': 'select',
'options': list(schema.container)
}
if isinstance(schema.container, collections.Mapping):
return {
'type': 'select',
'options': [{key: value}
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can just write list(schema.container.items())

for key, value in schema.container.items()]
}
else:
return {
'type': 'select',
'options': list(schema.container)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The value of options should always be the same. I suggest that if a non-mapping is given, both key and value are the same.

}

elif isinstance(schema, vol.Coerce):
schema = schema.type
Expand Down