From edd871bd37833fff7c5964896299999ce6da8e1c Mon Sep 17 00:00:00 2001
From: Aymeric Augustin
Date: Wed, 16 Oct 2013 23:08:03 +0200
Subject: Switch from str & unicode to bytes & text.

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

(limited to 'debug_toolbar/utils/tracking')

diff --git a/debug_toolbar/utils/tracking/db.py b/debug_toolbar/utils/tracking/db.py
index 59c9199..34adfae 100644
--- a/debug_toolbar/utils/tracking/db.py
+++ b/debug_toolbar/utils/tracking/db.py
@@ -8,7 +8,7 @@ from threading import local
 
 from django.conf import settings
 from django.template import Node
-from django.utils.encoding import force_unicode
+from django.utils.encoding import force_text
 
 from debug_toolbar.utils import ms_from_timedelta, tidy_stacktrace, \
                                 get_template_info, get_stack
@@ -88,7 +88,7 @@ class NormalCursorWrapper(object):
 
     def _decode(self, param):
         try:
-            return force_unicode(param, strings_only=True)
+            return force_text(param, strings_only=True)
         except UnicodeDecodeError:
             return '(encoded string)'
 
-- 
cgit v1.2.3