Ticket #3509: smart_unicode_fix.patch

django/newforms/util.py

@@ -6 +6 @@
 flatatt = lambda attrs: u''.join([u' %s="%s"' % (k, escape(v)) for k, v in attrs.items()])
 
 def smart_unicode(s):
-    if not isinstance(s, basestring):
-        if hasattr(s, '__unicode__'):
-            s = unicode(s)
-        else:
-            s = unicode(str(s), settings.DEFAULT_CHARSET)
-    elif not isinstance(s, unicode):
-        s = unicode(s, settings.DEFAULT_CHARSET)
+    if not s in (None, True, False):
+        if not isinstance(s, basestring):
+            if hasattr(s, '__unicode__'):
+                s = unicode(s)
+            else:
+                s = unicode(str(s), settings.DEFAULT_CHARSET)
+        elif not isinstance(s, unicode):
+            s = unicode(s, settings.DEFAULT_CHARSET)
     return s
 
 class StrAndUnicode(object):