Ticket #6184: 6184.diff

django/utils/encoding.py

@@ -66 +66 @@
 
     If strings_only is True, don't convert (some) non-string-like objects.
     """
-    if strings_only and isinstance(s, (types.NoneType, int)):
+    if strings_only and not isinstance(s, basestring):
         return s
     if isinstance(s, Promise):
         return unicode(s).encode(encoding, errors)