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

...

Browse Source
This commit is contained in:
Sengian 2011-01-07 08:15:59 +01:00
parent ac07ff853e
commit 24cb5514f0
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/calibre/ebooks/rtf2xml/check_encoding.py
View File

@ -16,7 +16,7 @@ class CheckEncoding:
sys.stderr.write(_('line: %s char: %s\n') % (line_num, char_position)) sys.stderr.write(_('line: %s char: %s\n') % (line_num, char_position))
sys.stderr.write(str(msg) + '\n') sys.stderr.write(str(msg) + '\n')
def check_encoding(self, path, encoding='us-ascii'): def check_encoding(self, path, encoding='us-ascii', verbose = True):
line_num = 0 line_num = 0
with open(path, 'r') as read_obj: with open(path, 'r') as read_obj:
for line in read_obj: for line in read_obj:
@ -24,10 +24,11 @@ class CheckEncoding:
try: try:
line.decode(encoding) line.decode(encoding)
except UnicodeError: except UnicodeError:
if len(line) < 1000: if verbose:
self.__get_position_error(line, encoding, line_num) if len(line) < 1000:
else: self.__get_position_error(line, encoding, line_num)
sys.stderr.write(_('line: %d has bad encoding\n') % line_num) else:
sys.stderr.write(_('line: %d has bad encoding\n') % line_num)
return True return True
return False return False

2
src/calibre/ebooks/rtf2xml/convert_to_tags.py
View File

@ -210,7 +210,7 @@ class ConvertToTags:
check_encoding_obj = check_encoding.CheckEncoding( check_encoding_obj = check_encoding.CheckEncoding(
bug_handler = self.__bug_handler, bug_handler = self.__bug_handler,
) )
if not check_encoding_obj.check_encoding(self.__file): if not check_encoding_obj.check_encoding(self.__file, verbose = False):
self.__write_obj.write('<?xml version="1.0" encoding="US-ASCII" ?>') self.__write_obj.write('<?xml version="1.0" encoding="US-ASCII" ?>')
elif not check_encoding_obj.check_encoding(self.__file, self.__encoding): elif not check_encoding_obj.check_encoding(self.__file, self.__encoding):
self.__write_obj.write('<?xml version="1.0" encoding="%s" ?>' % self.__encoding) self.__write_obj.write('<?xml version="1.0" encoding="%s" ?>' % self.__encoding)