diff options
| author | Anssi Kääriäinen <akaariai@gmail.com> | 2013-05-20 18:45:24 +0300 |
|---|---|---|
| committer | Anssi Kääriäinen <akaariai@gmail.com> | 2013-05-20 19:05:43 +0300 |
| commit | 0eddedf7db782a05e098c7024a9056aef7283b81 (patch) | |
| tree | 76849b94b0cbaf61f8fb9fb4f8b6a324c1759c03 /django | |
| parent | 367089a846b7546c98e1c6543b36bfc3b19ee9e8 (diff) | |
[1.5.x] 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.
Backpatch of 266c0bb23e9d64c47ace4d162e582febd5a1e336
Diffstat (limited to 'django')
| -rw-r--r-- | django/db/models/query.py | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/django/db/models/query.py b/django/db/models/query.py index 952739e939..292769303d 100644 --- a/django/db/models/query.py +++ b/django/db/models/query.py @@ -384,13 +384,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): """ |