Backup_Repos/calibre
1
0
Fork 0
mirror of git://github.com/kovidgoyal/calibre.git synced 2025-12-28 20:24:36 +01:00
Code Issues Projects Releases Wiki Activity

Ignore corrupted conversion config files instead of failling to convert

Browse source 
See #1306854 (Error when trying to convert)
This commit is contained in:
Kovid Goyal 2014-04-12 08:38:28 +05:30
parent 29fdb8dc62
commit cd7da5743e
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/calibre/ebooks/conversion/config.py
View file

@ -78,7 +78,7 @@ def __str__(self):
def from_string(self, raw):
try:
d = eval(raw)
except SyntaxError:
except (SyntaxError, TypeError):
d = None
if d:
self.update(d)
@ -89,7 +89,8 @@ def merge_recommendations(self, get_option, level, options,
if only_existing and name not in self:
continue
opt = get_option(name)
if opt is None: continue
if opt is None:
continue
if opt.level == OptionRecommendation.HIGH:
self[name] = opt.recommended_value
self.disabled_options.add(name)