summaryrefslogtreecommitdiff
path: root/django/db/models/__init__.py
diff options
context:
space:
mode:
authorAnssi Kääriäinen <anssi.kaariainen@thl.fi>2016-02-02 11:33:09 +0200
committerTim Graham <timograham@gmail.com>2016-04-29 13:06:32 -0400
commit7f51876f99851fdc3fef63aecdfbcffa199c26b9 (patch)
tree9b2fc6cda60771d699c85a5259ba80b120417fcd /django/db/models/__init__.py
parentdac075e9103ba961af4f70b4011616daa72985d4 (diff)
downloaddjango-7f51876f99851fdc3fef63aecdfbcffa199c26b9.tar.gz
Fixed #26207 -- Replaced dynamic classes with non-data descriptors for deferred instance loading.
Diffstat (limited to 'django/db/models/__init__.py')
-rw-r--r--django/db/models/__init__.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/django/db/models/__init__.py b/django/db/models/__init__.py
index 354985297e..958b122d9f 100644
--- a/django/db/models/__init__.py
+++ b/django/db/models/__init__.py
@@ -19,7 +19,7 @@ from django.db.models.query import ( # NOQA
)
# Imports that would create circular imports if sorted
-from django.db.models.base import Model # NOQA isort:skip
+from django.db.models.base import DEFERRED, Model # NOQA isort:skip
from django.db.models.fields.related import ( # NOQA isort:skip
ForeignKey, ForeignObject, OneToOneField, ManyToManyField,
ManyToOneRel, ManyToManyRel, OneToOneRel,