Repair damage during conflict resolution

This commit is contained in:
Charles Haley 2010-09-24 08:21:10 +01:00
parent 197e16e62a
commit 992e5c3c08

View File

@ -50,7 +50,7 @@ class TemplateFormatter(string.Formatter):
format_string_re = re.compile(r'^(.*)\|(.*)\|(.*)$')
compress_spaces = re.compile(r'\s+')
def get_value(self, key, args):
def get_value(self, key, args, kwargs):
raise Exception('get_value must be implemented in the subclass')