From 99ca7c2bd3e04b343f4a0fe2d5add7c6d6f3a456 Mon Sep 17 00:00:00 2001 From: Tim Graham Date: Sun, 1 Feb 2015 19:54:20 -0500 Subject: [PATCH] Removed Query.raise_field_error() This method was inadvertently reintroduced in f59fd15c4928caf3dfcbd50f6ab47be409a43b01 --- django/db/models/sql/query.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/django/db/models/sql/query.py b/django/db/models/sql/query.py index b5ece24a0e..54ca929a85 100644 --- a/django/db/models/sql/query.py +++ b/django/db/models/sql/query.py @@ -1390,11 +1390,6 @@ class Query(object): break return path, final_field, targets, names[pos + 1:] - def raise_field_error(self, opts, name): - available = list(get_field_names_from_opts(opts)) + list(self.annotation_select) - raise FieldError("Cannot resolve keyword %r into field. " - "Choices are: %s" % (name, ", ".join(available))) - def setup_joins(self, names, opts, alias, can_reuse=None, allow_many=True): """ Compute the necessary table joins for the passage through the fields