Changeset 6649

Timestamp:

11/03/07 22:37:04 (8 months ago)

Author:

mtredinnick

Message:

Fixed #5640 -- Added some extra error reporting when smart_unicode() or
force_unicode() raise a UnicodeDecodeError?. This should at least help people
identify which is the bad piece of data they passed in. About the best we can
do here.

Files:

• django/trunk/django/utils/encoding.py (modified) (2 diffs)

django/trunk/django/utils/encoding.py

@@ -2 +2 @@
-import urllib
-import datetime
+
-from django.utils.functional import Promise
+
+class DjangoUnicodeDecodeError(UnicodeDecodeError):
+    def __init__(self, obj, *args):
+        self.obj = obj
+        UnicodeDecodeError.__init__(self, *args)
+
+    def __str__(self):
+        original = UnicodeDecodeError.__str__(self)
+        return '%s. You passed in %r (%s)' % (original, self.obj,
+                type(self.obj))
-
-class StrAndUnicode(object):
@@ -34 +45 @@
-    if strings_only and isinstance(s, (types.NoneType, int, long, datetime.datetime, datetime.date, datetime.time, float)):
-        return s
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-    return s
-