summaryrefslogtreecommitdiff
path: root/django/db/models/sql
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2015-01-18 13:53:36 -0500
committerTim Graham <timograham@gmail.com>2015-01-18 14:01:25 -0500
commit2cd00424c4a14b04973629d9f027df5281806e15 (patch)
tree7360ad3fd54981a7ab3c93ecc36989e0b26069f2 /django/db/models/sql
parent4548a282a1c64bb2ed414da3d08617d869cd3740 (diff)
Removed support for callable QuerySet arguments per deprecation timeline; refs #11629.
Diffstat (limited to 'django/db/models/sql')
-rw-r--r--django/db/models/sql/query.py7
1 files changed, 1 insertions, 6 deletions
diff --git a/django/db/models/sql/query.py b/django/db/models/sql/query.py
index c5e7eab28c..ace562a8fa 100644
--- a/django/db/models/sql/query.py
+++ b/django/db/models/sql/query.py
@@ -27,7 +27,7 @@ from django.db.models.sql.datastructures import (
from django.db.models.sql.where import (WhereNode, Constraint, EverythingNode,
ExtraWhere, AND, OR, EmptyWhere)
from django.utils import six
-from django.utils.deprecation import RemovedInDjango19Warning, RemovedInDjango20Warning
+from django.utils.deprecation import RemovedInDjango20Warning
from django.utils.encoding import force_text
from django.utils.tree import Node
@@ -973,11 +973,6 @@ class Query(object):
raise ValueError("Cannot use None as a query value")
lookups[-1] = 'isnull'
value = True
- elif callable(value):
- warnings.warn(
- "Passing callable arguments to queryset is deprecated.",
- RemovedInDjango19Warning, stacklevel=2)
- value = value()
elif hasattr(value, 'resolve_expression'):
pre_joins = self.alias_refcount.copy()
value = value.resolve_expression(self, reuse=can_reuse, allow_joins=allow_joins)