From 14a5d62efda46b6ea6c71c9fcbf9d06099e2dcf9 Mon Sep 17 00:00:00 2001 From: Frens Jan Rumph Date: Fri, 7 Jul 2017 21:50:37 +0200 Subject: [PATCH 1/2] support formatting of enum choices --- graphene_django/converter.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/graphene_django/converter.py b/graphene_django/converter.py index b1a8837fa..839ecc385 100644 --- a/graphene_django/converter.py +++ b/graphene_django/converter.py @@ -1,3 +1,5 @@ +import enum + from django.db import models from django.utils.encoding import force_text @@ -17,6 +19,8 @@ def convert_choice_name(name): + if isinstance(name, enum.Enum): + name = name.name name = to_const(force_text(name)) try: assert_valid_name(name) From 04c4d29934ea362aa717ec6267f4930e8b06dd6a Mon Sep 17 00:00:00 2001 From: Frens Jan Rumph Date: Sun, 9 Jul 2017 22:06:00 +0200 Subject: [PATCH 2/2] convert enum name without breaking things on platforms without enum --- graphene_django/converter.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/graphene_django/converter.py b/graphene_django/converter.py index 839ecc385..008c02737 100644 --- a/graphene_django/converter.py +++ b/graphene_django/converter.py @@ -1,5 +1,3 @@ -import enum - from django.db import models from django.utils.encoding import force_text @@ -19,8 +17,7 @@ def convert_choice_name(name): - if isinstance(name, enum.Enum): - name = name.name + name = getattr(name, 'name', name) name = to_const(force_text(name)) try: assert_valid_name(name)