summaryrefslogtreecommitdiff
path: root/django/db/models/__init__.py
diff options
context:
space:
mode:
authorJosh Smeaton <josh.smeaton@gmail.com>2013-12-26 00:13:18 +1100
committerMarc Tamlyn <marc.tamlyn@gmail.com>2014-11-15 14:00:43 +0000
commitf59fd15c4928caf3dfcbd50f6ab47be409a43b01 (patch)
treefe4a04d98359e1ffcbfe991303eb97d9a8e16afc /django/db/models/__init__.py
parent39e3ef88c237e3f4cedc89cd36494a6d3f490812 (diff)
downloaddjango-f59fd15c4928caf3dfcbd50f6ab47be409a43b01.tar.gz
Fixed #14030 -- Allowed annotations to accept all expressions
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 c054542e3e..6fe8fe8aae 100644
--- a/django/db/models/__init__.py
+++ b/django/db/models/__init__.py
@@ -4,7 +4,7 @@ import warnings
from django.core.exceptions import ObjectDoesNotExist, ImproperlyConfigured # NOQA
from django.db.models.query import Q, QuerySet, Prefetch # NOQA
-from django.db.models.expressions import F # NOQA
+from django.db.models.expressions import ExpressionNode, F, Value, Func # NOQA
from django.db.models.manager import Manager # NOQA
from django.db.models.base import Model # NOQA
from django.db.models.aggregates import * # NOQA