Backup_Repos/calibre
1
0
Fork 0
mirror of git://github.com/kovidgoyal/calibre.git synced 2026-05-09 11:14:02 +02:00
Code Issues Projects Releases Wiki Activity

Don't choke if the user provides an invalid remove header/footer regexp

Browse source
This commit is contained in:
Kovid Goyal 2010-03-21 07:20:57 +05:30
parent 8af795d9dd
commit 70d9a6d3d6
1 changed files with 18 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/calibre/ebooks/conversion/preprocess.py
View file

@ -230,14 +230,25 @@ def __call__(self, html, remove_special_chars=None):
end_rules = []
if getattr(self.extra_opts, 'remove_header', None):
end_rules.append(
(re.compile(getattr(self.extra_opts, 'header_regex')), lambda match : '')
)
try:
end_rules.append(
(re.compile(self.extra_opts.header_regex), lambda match : '')
)
except:
import traceback
print 'Failed to parse remove_header regexp'
traceback.print_exc()
if getattr(self.extra_opts, 'remove_footer', None):
end_rules.append(
(re.compile(getattr(self.extra_opts, 'footer_regex')), lambda match : '')
)
try:
end_rules.append(
(re.compile(self.extra_opts.footer_regex), lambda match : '')
)
except:
import traceback
print 'Failed to parse remove_footer regexp'
traceback.print_exc()
if getattr(self.extra_opts, 'unwrap_factor', 0.0) > 0.01:
length = line_length(html, getattr(self.extra_opts, 'unwrap_factor'))
if length: