From 8d0245d51bf3dda12a89dd1b5b5e5bad69959519 Mon Sep 17 00:00:00 2001
From: David Cramer
Date: Wed, 20 Feb 2013 13:44:10 -0800
Subject: Improve how we decode strings

---
 debug_toolbar/utils/tracking/db.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'debug_toolbar/utils/tracking')

diff --git a/debug_toolbar/utils/tracking/db.py b/debug_toolbar/utils/tracking/db.py
index db9974e..b675227 100644
--- a/debug_toolbar/utils/tracking/db.py
+++ b/debug_toolbar/utils/tracking/db.py
@@ -92,9 +92,10 @@ class NormalCursorWrapper(object):
         return map(self._quote_expr, params)
 
     def _decode(self, param):
-        if isinstance(param, unicode):
-            return param.decode('utf-8', 'ignore')
-        return param
+        try:
+            return force_unicode(param, strings_only=True)
+        except UnicodeDecodeError:
+            return '(encoded string)'
 
     def execute(self, sql, params=()):
         start = datetime.now()
-- 
cgit v1.2.3