mirror of
git://github.com/kovidgoyal/calibre.git
synced 2026-05-08 14:14:31 +02:00
Merge from trunk
This commit is contained in:
commit
0ee62950fb
1 changed files with 1 additions and 1 deletions
|
|
@ -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(']]', '}')
|
||||
|
|
|
|||
Loading…
Reference in a new issue