summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
authorJannis Leidel <jannis@leidel.info>2011-04-22 18:17:26 +0000
committerJannis Leidel <jannis@leidel.info>2011-04-22 18:17:26 +0000
commitc77372cad034b06c1b7239ff6e1284c832f4a541 (patch)
tree02924b6751e9c5106c6084b559e7c721a2243b58 /django
parentc8092b840b4151724a6babdbeb84cf3138057c6a (diff)
Fixed #14729 -- RawQuerySet.__repr__ fails when params passed as list. Thanks, intgr for ticket and accuser for patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16088 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django')
-rw-r--r--django/db/models/query.py2
-rw-r--r--django/db/models/sql/query.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/django/db/models/query.py b/django/db/models/query.py
index 09d960b3ec..9c3aeaa8d3 100644
--- a/django/db/models/query.py
+++ b/django/db/models/query.py
@@ -1385,7 +1385,7 @@ class RawQuerySet(object):
yield instance
def __repr__(self):
- return "<RawQuerySet: %r>" % (self.raw_query % self.params)
+ return "<RawQuerySet: %r>" % (self.raw_query % tuple(self.params))
def __getitem__(self, k):
return list(self)[k]
diff --git a/django/db/models/sql/query.py b/django/db/models/sql/query.py
index f41272cf0f..c29673ecdd 100644
--- a/django/db/models/sql/query.py
+++ b/django/db/models/sql/query.py
@@ -74,7 +74,7 @@ class RawQuery(object):
return iter(result)
def __repr__(self):
- return "<RawQuery: %r>" % (self.sql % self.params)
+ return "<RawQuery: %r>" % (self.sql % tuple(self.params))
def _execute_query(self):
self.cursor = connections[self.using].cursor()