From 36b7024b7fc881b319a2b67876e4f72ba680d6a8 Mon Sep 17 00:00:00 2001 From: James Ostrander Date: Fri, 19 Apr 2024 14:44:54 -0400 Subject: [PATCH] Fixed #35392, Refs #34331 -- Allowed importing aprefetch_related_objects from django.db.models. Thanks James Ostrander for the report and fix, and to Tim Graham and Mariusz Felisiak for the reviews. --- django/db/models/__init__.py | 8 +++++++- docs/releases/5.0.5.txt | 3 +++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/django/db/models/__init__.py b/django/db/models/__init__.py index 3923cea591d..fe81d92d366 100644 --- a/django/db/models/__init__.py +++ b/django/db/models/__init__.py @@ -46,7 +46,12 @@ from django.db.models.indexes import * # NOQA from django.db.models.indexes import __all__ as indexes_all from django.db.models.lookups import Lookup, Transform from django.db.models.manager import Manager -from django.db.models.query import Prefetch, QuerySet, prefetch_related_objects +from django.db.models.query import ( + Prefetch, + QuerySet, + aprefetch_related_objects, + prefetch_related_objects, +) from django.db.models.query_utils import FilteredRelation, Q # Imports that would create circular imports if sorted @@ -104,6 +109,7 @@ __all__ += [ "Prefetch", "Q", "QuerySet", + "aprefetch_related_objects", "prefetch_related_objects", "DEFERRED", "Model", diff --git a/docs/releases/5.0.5.txt b/docs/releases/5.0.5.txt index 788753c8263..8836b861316 100644 --- a/docs/releases/5.0.5.txt +++ b/docs/releases/5.0.5.txt @@ -20,3 +20,6 @@ Bugfixes * Fixed a bug in Django 5.0 that caused a crash when applying migrations including alterations to ``GeneratedField`` such as setting ``db_index=True`` on SQLite (:ticket:`35373`). + +* Allowed importing ``aprefetch_related_objects`` from ``django.db.models`` + (:ticket:`35392`).