Ticket #4089: defaultfilters.py.diff

django/template/defaultfilters.py

@@ -321 +321 @@
     "Joins a list with a string, like Python's ``str.join(list)``"
     try:
         return arg.join(map(smart_string, value))
-    except AttributeError: # fail silently but nicely
+    except AttributeError, TypeError: # fail silently but nicely
         return value
 
 def length(value):