Fix #1441 (This book cause calibre to hang)

This commit is contained in:
Kovid Goyal 2008-12-23 13:14:12 -08:00
parent af1319138a
commit 252dd342e0
2 changed files with 5 additions and 2 deletions

View File

@ -233,7 +233,7 @@ class ParseRtf:
bug_handler = RtfInvalidCodeException,
)
check_encoding_obj.check_encoding(self.__file)
sys.stderr.write('File "%s" does not appear to be RTF.\n' % self.__file)
sys.stderr.write('File "%s" does not appear to be RTF.\n' % self.__file if isinstance(self.__file, str) else self.__file.encode('utf-8'))
raise InvalidRtfException, msg
delete_info_obj = delete_info.DeleteInfo(
in_file = self.__temp_file,

View File

@ -23,7 +23,10 @@ class CheckEncoding:
try:
line.decode(encoding)
except UnicodeError:
self.__get_position_error(line, encoding, line_num)
if len(line) < 1000:
self.__get_position_error(line, encoding, line_num)
else:
sys.stderr.write('line: %d has bad encoding\n'%line_num)
if __name__ == '__main__':
check_encoding_obj = CheckEncoding()
check_encoding_obj.check_encoding(sys.argv[1])