--- a/mercurial/templater.py	Tue Jun 08 09:30:33 2010 +0200
+++ b/mercurial/templater.py	Tue Jun 08 09:30:45 2010 +0200
@@ -17,7 +17,7 @@
     if isinstance(thing, str):
         yield thing
     elif not hasattr(thing, '__iter__'):
-        if i is not None:
+        if thing is not None:
             yield str(thing)
     else:
         for i in thing: