mirror of
https://github.com/kovidgoyal/calibre.git
synced 2025-07-09 03:04:10 -04:00
Merge from trunk
This commit is contained in:
commit
0ee62950fb
@ -55,7 +55,7 @@ class _Parser(object):
|
|||||||
}
|
}
|
||||||
x = float(x if x else 0)
|
x = float(x if x else 0)
|
||||||
y = float(y if y 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):
|
def _template(self, template):
|
||||||
template = template.replace('[[', '{').replace(']]', '}')
|
template = template.replace('[[', '{').replace(']]', '}')
|
||||||
|
Loading…
x
Reference in New Issue
Block a user