Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix regression in evaluating composite columns that use other composite columns.

Browse Source 
Assume column X uses column Y. If X assigns to template variables then evaluated Y, the variables were cleared. The regression happened because the performance increase changes to use ProxyMetadata also caused X and Y to be evaluated in the same formatter instance where before they were evaluated in separate instances. This triggered a long-standing latent bug where a 'global' local variable dictionary was cleared every time a template was executed. The fix is to make the local variable dict local to the template evaluation instance.
This commit is contained in:
Charles Haley 2014-11-17 18:25:45 +01:00
parent 0f65b3981d
commit b98db0e2b2
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/calibre/utils/formatter.py
View File

@ -30,10 +30,9 @@ class _Parser(object):
if prog[1] != '':
self.error(_('failed to scan program. Invalid input {0}').format(prog[1]))
self.parent = parent
parent.locals = {'$':val}
self.parent_kwargs = parent.kwargs
self.parent_book = parent.book
self.parent_locals = parent.locals
self.locals = {'$':val}
def error(self, message):
m = 'Formatter: ' + message + _(' near ')
@ -129,8 +128,8 @@ class _Parser(object):
self.consume()
cls = funcs['assign']
return cls.eval_(self.parent, self.parent_kwargs,
self.parent_book, self.parent_locals, id, self.expr())
val = self.parent.locals.get(id, None)
self.parent_book, self.locals, id, self.expr())
val = self.locals.get(id, None)
if val is None:
self.error(_('Unknown identifier ') + id)
return val
@ -166,7 +165,7 @@ class _Parser(object):
if cls.arg_count != -1 and len(args) != cls.arg_count:
self.error('incorrect number of arguments for function {}'.format(id))
return cls.eval_(self.parent, self.parent_kwargs,
self.parent_book, self.parent_locals, *args)
self.parent_book, self.locals, *args)
elif self.token_is_constant():
# String or number
return self.token()
@ -182,10 +181,9 @@ class _CompileParser(_Parser):
if prog[1] != '':
self.error(_('failed to scan program. Invalid input {0}').format(prog[1]))
self.parent = parent
parent.locals = {'$':val}
self.parent_kwargs = parent.kwargs
self.parent_book = parent.book
self.parent_locals = parent.locals
self.locals = {'$':val}
self.compile_text = compile_text
def program(self):
@ -233,12 +231,12 @@ class _CompileParser(_Parser):
if self.compile_text:
self.compile_text += '\targs[%d] = list()\n'%(level+1,)
val = cls.eval_(self.parent, self.parent_kwargs,
self.parent_book, self.parent_locals, id, self.expr(level+1))
self.parent_book, self.locals, id, self.expr(level+1))
if self.compile_text:
self.compile_text += "\tlocals['%s'] = args[%d][0]\n"%(id, level+1)
self.compile_text += "\targs[%d].append(args[%d][0])\n"%(level, level+1)
return val
val = self.parent.locals.get(id, None)
val = self.locals.get(id, None)
if val is None:
self.error(_('Unknown identifier ') + id)
if self.compile_text:
@ -293,7 +291,7 @@ class _CompileParser(_Parser):
"\targs[%d].append(self.__funcs__['%s']"
".eval_(formatter, kwargs, book, locals, *args[%d]))\n")%(level, id, level+1)
return cls.eval_(self.parent, self.parent_kwargs,
self.parent_book, self.parent_locals, *args)
self.parent_book, self.locals, *args)
elif self.token_is_constant():
# String or number
v = unicode(self.token())