Skip to content

Commit

Permalink
fix: Fix broke 'get_choices' with restframework 3.15.0 (#1506)
Browse files Browse the repository at this point in the history
  • Loading branch information
diogosilva30 authored Mar 18, 2024
1 parent 54372b4 commit ac09cd2
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions graphene_django/converter.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import inspect
from collections import OrderedDict
from functools import partial, singledispatch, wraps

from django.db import models
Expand Down Expand Up @@ -72,8 +71,13 @@ def convert_choice_name(name):

def get_choices(choices):
converted_names = []
if isinstance(choices, OrderedDict):

# In restframework==3.15.0, choices are not passed
# as OrderedDict anymore, so it's safer to check
# for a dict
if isinstance(choices, dict):
choices = choices.items()

for value, help_text in choices:
if isinstance(help_text, (tuple, list)):
yield from get_choices(help_text)
Expand Down

0 comments on commit ac09cd2

Please sign in to comment.