graphql-python/graphene-django
1
1
Fork 0
mirror of https://github.com/graphql-python/graphene-django.git synced 2024-11-29 04:53:43 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #23 from morgante/fix_choice_enums

Browse Source 
Fix #19 by using choice keys as enum keys, not choice descriptions
This commit is contained in:
Syrus Akbary 2016-10-15 15:58:29 -07:00 committed by GitHub
commit 3a9ffba560
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
graphene_django/converter.py
View File

@ -7,6 +7,7 @@ from graphene.relay import is_node
from graphene.types.datetime import DateTime from graphene.types.datetime import DateTime
from graphene.types.json import JSONString from graphene.types.json import JSONString
from graphene.utils.str_converters import to_const from graphene.utils.str_converters import to_const
from graphql import assert_valid_name
from .compat import (ArrayField, HStoreField, JSONField, RangeField, from .compat import (ArrayField, HStoreField, JSONField, RangeField,
RelatedObject, UUIDField) RelatedObject, UUIDField)
@ -17,7 +18,12 @@ singledispatch = import_single_dispatch()
def convert_choice_name(name): def convert_choice_name(name):
return to_const(force_text(name)) name = to_const(force_text(name))
try:
assert_valid_name(name)
except AssertionError:
name = "A_%s" % name
return name
def get_choices(choices): def get_choices(choices):
@ -26,7 +32,7 @@ def get_choices(choices):
for choice in get_choices(help_text): for choice in get_choices(help_text):
yield choice yield choice
else: else:
name = convert_choice_name(help_text) name = convert_choice_name(value)
description = help_text description = help_text
yield name, value, description yield name, value, description