Ticket #7557: 7557-1.diff

django/template/__init__.py

@@ -636 +636 @@
             if var.endswith('.'):
                 raise ValueError
 
+        except TypeError:
+              raise TypeError("Variable must be a string or number, got %s" % type(var))
+
         except ValueError:
             # A ValueError means that the variable isn't a number.
             if var.startswith('_(') and var.endswith(')'):