summaryrefslogtreecommitdiff
path: root/django/db/models/sql
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2016-12-31 11:24:40 -0500
committerTim Graham <timograham@gmail.com>2017-01-17 20:52:03 -0500
commitbfe0d54514bf4f03bc4a956452541f0103134ba3 (patch)
tree0e71ff29d522711789e498ec86f9d1de42e32056 /django/db/models/sql
parent2d7fb779870583f8c6ee003f81bf67c4d7c21227 (diff)
Refs #26230 -- Removed support for model name query lookups when using Meta.default_related_name.
Per deprecation timeline.
Diffstat (limited to 'django/db/models/sql')
-rw-r--r--django/db/models/sql/query.py15
1 files changed, 0 insertions, 15 deletions
diff --git a/django/db/models/sql/query.py b/django/db/models/sql/query.py
index 5f65786373..57ba7dfc8d 100644
--- a/django/db/models/sql/query.py
+++ b/django/db/models/sql/query.py
@@ -7,7 +7,6 @@ databases). The abstraction barrier only works one way: this module has to know
all about the internals of models in order to get the information it needs.
"""
import copy
-import warnings
from collections import Counter, Iterator, Mapping, OrderedDict
from itertools import chain, count, product
from string import ascii_uppercase
@@ -32,7 +31,6 @@ from django.db.models.sql.where import (
AND, OR, ExtraWhere, NothingNode, WhereNode,
)
from django.utils import six
-from django.utils.deprecation import RemovedInDjango20Warning
from django.utils.encoding import force_text
from django.utils.tree import Node
@@ -1320,19 +1318,6 @@ class Query(object):
except FieldDoesNotExist:
if name in self.annotation_select:
field = self.annotation_select[name].output_field
- elif pos == 0:
- for rel in opts.related_objects:
- if (name == rel.related_model._meta.model_name and
- rel.related_name == rel.related_model._meta.default_related_name):
- related_name = rel.related_name
- field = opts.get_field(related_name)
- warnings.warn(
- "Query lookup '%s' is deprecated in favor of "
- "Meta.default_related_name '%s'."
- % (name, related_name),
- RemovedInDjango20Warning, 2
- )
- break
if field is not None:
# Fields that contain one-to-many relations with a generic