summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
authorAnssi Kääriäinen <akaariai@gmail.com>2013-05-20 18:45:24 +0300
committerAnssi Kääriäinen <akaariai@gmail.com>2013-05-20 18:50:40 +0300
commit266c0bb23e9d64c47ace4d162e582febd5a1e336 (patch)
tree3032806322f65e1aa04dd16e239966d3576fabf1 /django
parentc9a96075fa02b6d52bec748ffdfb413688a15774 (diff)
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.
Diffstat (limited to 'django')
-rw-r--r--django/db/models/query.py10
1 files changed, 4 insertions, 6 deletions
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):
"""