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

Jump to bottom

Fixed #34807 -- Avoided circular import between forms, models and utils' choices. #17215

Merged
merged 1 commit into from
Sep 1, 2023
Merged

Fixed #34807 -- Avoided circular import between forms, models and utils' choices. #17215

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion django/utils/choices.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
from collections.abc import Callable, Iterable, Iterator, Mapping

from django.db.models.enums import ChoicesMeta
from django.utils.functional import Promise


Expand All @@ -20,6 +19,8 @@ def __iter__(self):

def normalize_choices(value, *, depth=0):
"""Normalize choices values consistently for fields and widgets."""
# Avoid circular import when importing django.forms.
from django.db.models.enums import ChoicesMeta

match value:
case ChoiceIterator() | Promise() | bytes() | str():
Expand Down