Changeset 5247

Timestamp:

05/15/07 11:13:37 (1 year ago)

Author:

mtredinnick

Message:

unicode: Improved the fix for debug query logging from [5208]. Refs #3891.

Files:

• django/branches/unicode/django/db/backends/util.py (modified) (3 diffs)

django/branches/unicode/django/db/backends/util.py

@@ -14 +14 @@
-        finally:
-            stop = time()
-            # If params was a list, convert it to a tuple, because string
-            # formatting with '%' only works with tuples or dicts.
-            if not isinstance(params, (tuple, dict)):
-                params = tuple(params)
-            self.db.queries.append({
-params
+convert_args(params)
-                'time': "%.3f" % (stop - start),
-            })
@@ -30 +26 @@
-            stop = time()
-            self.db.queries.append({
-tr
+mart_unicode
-                'time': "%.3f" % (stop - start),
-            })
@@ -39 +35 @@
-        else:
-            return getattr(self.cursor, attr)
+
+def convert_args(args):
+    """
+    Convert sequence or dictionary to contain unicode values.
+    """
+    if isinstance(args, (list, tuple)):
+        return tuple([smart_unicode(val) for val in args])
+    else:
+        return dict([(smart_unicode(k), smart_unicode(v)) for k, v in args.items()])
-
-###############################################