summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Ostrander <jlost@umich.edu>2024-04-19 14:44:54 -0400
committerNatalia <124304+nessita@users.noreply.github.com>2024-04-22 17:06:18 -0300
commitea81c9d343a400b537caaafb47d03676c03df246 (patch)
treeea2ba915407f750792e496ca7b59ec4672a7affb
parenta42a2fa267c68ed2cc97559396178deaa9477ef3 (diff)
[5.0.x] 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. Backport of 36b7024b7fc881b319a2b67876e4f72ba680d6a8 from main
-rw-r--r--django/db/models/__init__.py8
-rw-r--r--docs/releases/5.0.5.txt3
2 files changed, 10 insertions, 1 deletions
diff --git a/django/db/models/__init__.py b/django/db/models/__init__.py
index 9426280215..f7aab5ccb6 100644
--- a/django/db/models/__init__.py
+++ b/django/db/models/__init__.py
@@ -45,7 +45,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
@@ -102,6 +107,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 788753c826..8836b86131 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`).