# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1279523628 -3600
# Node ID 5ac8451a1bc4478e5623af9c585b389ff448809f
# Parent  25fcb8ed70c40a07d29254e6c1f536e40e45f17e# Parent  09e39675a7020345e60c7bcf9905a7d8fdb4ecd7
(stable) merge

diff -r 25fcb8ed70c4 -r 5ac8451a1bc4 hgkw/keyword.py
--- a/hgkw/keyword.py	Wed Jun 16 11:08:43 2010 +0200
+++ b/hgkw/keyword.py	Mon Jul 19 08:13:48 2010 +0100
@@ -159,9 +159,9 @@
         kwpat = r'\$(%s)(: [^$\n\r]*? )??\$' % '|'.join(escaped)
         self.re_kw = re.compile(kwpat)
 
-        templatefilters.filters['utcdate'] = utcdate
-        templatefilters.filters['svnisodate'] = svnisodate
-        templatefilters.filters['svnutcdate'] = svnutcdate
+        templatefilters.filters.update({'utcdate': utcdate,
+                                        'svnisodate': svnisodate,
+                                        'svnutcdate': svnutcdate})
 
     def substitute(self, data, path, ctx, subfunc):
         '''Replaces keywords in data with expanded template.'''