diff -r 98d4c642d7f2 -r a185b1af207c mercurial/templatefilters.py --- a/mercurial/templatefilters.py Thu Mar 01 18:15:58 2018 -0500 +++ b/mercurial/templatefilters.py Fri Mar 02 04:59:27 2018 +0530 @@ -264,9 +264,9 @@ return encoding.lower(text) @templatefilter('nonempty') -def nonempty(str): +def nonempty(text): """Any text. Returns '(none)' if the string is empty.""" - return str or "(none)" + return text or "(none)" @templatefilter('obfuscate') def obfuscate(text):