--- a/mercurial/cmdutil.py	Tue Aug 25 09:38:06 2015 -0500
+++ b/mercurial/cmdutil.py	Tue Aug 25 12:57:21 2015 -0500
@@ -1450,10 +1450,10 @@
 
         types = {'header': '', 'footer': '', 'changeset': 'changeset'}
         for mode, postfix in tmplmodes:
-            for type in types:
-                cur = postfix and ('%s_%s' % (type, postfix)) or type
+            for t in types:
+                cur = postfix and ('%s_%s' % (t, postfix)) or t
                 if mode and cur in self.t:
-                    types[type] = cur
+                    types[t] = cur
 
         try:
             # write header