Merge from trunk

This commit is contained in:
Charles Haley 2010-12-26 08:55:32 +00:00
commit 0ee62950fb

View file

@ -55,7 +55,7 @@ def _math(self, x, y, op=None):
}
x = float(x if x else 0)
y = float(y if y else 0)
return str(ops[op](x, y))
return unicode(ops[op](x, y))
def _template(self, template):
template = template.replace('[[', '{').replace(']]', '}')