diff -r 0884558504a3 -r 7bc92583f344 hgkw/keyword.py
--- a/hgkw/keyword.py	Sun Mar 30 18:25:25 2008 +0200
+++ b/hgkw/keyword.py	Mon Mar 31 10:50:10 2008 +0200
@@ -173,18 +173,12 @@
     def _kwweb_changeset(web, req, tmpl):
         '''Wraps webcommands.changeset turning off keyword expansion.'''
         kwtools['templater'].matcher = util.never
-        try:
-            return _webcommands_changeset(web, req, tmpl)
-        except TypeError:
-            return _webcommands_changeset(tmpl, web.changectx(req))
+        return _webcommands_changeset(web, req, tmpl)
 
     def _kwweb_filediff(web, req, tmpl):
         '''Wraps webcommands.filediff turning off keyword expansion.'''
         kwtools['templater'].matcher = util.never
-        try:
-            return _webcommands_filediff(web, req, tmpl)
-        except TypeError:
-            return _webcommands_filediff(tmpl, web.filectx(req))
+        return _webcommands_filediff(web, req, tmpl)
 
     webcommands.changeset = webcommands.rev = _kwweb_changeset
     webcommands.filediff = webcommands.diff = _kwweb_filediff