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) diff --git a/tests/queries/tests.py b/tests/queries/tests.py index 92e5982e10..3044faea6e 100644 --- a/tests/queries/tests.py +++ b/tests/queries/tests.py @@ -5,7 +5,6 @@ import datetime from operator import attrgetter import pickle import unittest -import warnings from django.core.exceptions import FieldError from django.db import connection, DEFAULT_DB_ALIAS @@ -15,7 +14,6 @@ from django.db.models.sql.constants import LOUTER from django.db.models.sql.datastructures import EmptyResultSet from django.test import TestCase, skipUnlessDBFeature from django.test.utils import CaptureQueriesContext -from django.utils.deprecation import RemovedInDjango19Warning from django.utils import six from django.utils.six.moves import range @@ -1164,17 +1162,6 @@ class Queries1Tests(BaseQuerysetTest): ['', '', '', ''] ) - def test_callable_args(self): - with warnings.catch_warnings(record=True) as w: - warnings.simplefilter('always') - qs = Tag.objects.filter(name__startswith=lambda: 't') - self.assertQuerysetEqual( - qs, - ['', '', '', '', ''] - ) - self.assertEqual(len(w), 1) - self.assertTrue(issubclass(w[0].category, RemovedInDjango19Warning)) - class Queries2Tests(TestCase): @classmethod