From 266c0bb23e9d64c47ace4d162e582febd5a1e336 Mon Sep 17 00:00:00 2001 From: Anssi Kääriäinen Date: Mon, 20 May 2013 18:45:24 +0300 Subject: Fixed #20278 -- ensured .get() exceptions do not recurse infinitely A regression caused by d5b93d3281fe93cbef5de84a52 made .get() error reporting recurse infinitely on certain rare conditions. Fixed this by not trying to print the given lookup kwargs. --- django/db/models/query.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'django') diff --git a/django/db/models/query.py b/django/db/models/query.py index d3763d3934..4313d044ee 100644 --- a/django/db/models/query.py +++ b/django/db/models/query.py @@ -388,13 +388,11 @@ class QuerySet(object): return clone._result_cache[0] if not num: raise self.model.DoesNotExist( - "%s matching query does not exist. " - "Lookup parameters were %s" % - (self.model._meta.object_name, kwargs)) + "%s matching query does not exist." % + self.model._meta.object_name) raise self.model.MultipleObjectsReturned( - "get() returned more than one %s -- it returned %s! " - "Lookup parameters were %s" % - (self.model._meta.object_name, num, kwargs)) + "get() returned more than one %s -- it returned %s!" % + (self.model._meta.object_name, num)) def create(self, **kwargs): """ -- cgit v1.3