From 5784256e022b700adfeaa99959389aab96868e5b Mon Sep 17 00:00:00 2001 From: Sengian Date: Wed, 5 Jan 2011 22:39:26 +0100 Subject: [PATCH] Check if tokens are correct ascii --- src/calibre/ebooks/rtf2xml/process_tokens.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/calibre/ebooks/rtf2xml/process_tokens.py b/src/calibre/ebooks/rtf2xml/process_tokens.py index 13ce495e67..2c603ea28d 100755 --- a/src/calibre/ebooks/rtf2xml/process_tokens.py +++ b/src/calibre/ebooks/rtf2xml/process_tokens.py @@ -779,12 +779,16 @@ class ProcessTokens: msg =_('Invalid RTF: document doesn\'t start with \\rtf \n') raise self.__exception_handler, msg - ##token = self.evaluate_token(token) the_index = token.find('\\ ') if token is not None and the_index > -1: - msg ='Invalid RTF: token "\\ " not valid.\n' + msg =_('Invalid RTF: token "\\ " not valid.\n') raise self.__exception_handler, msg elif token[:1] == "\\": + try: + token.decode('us-ascii') + except UnicodeError, msg: + msg = _('Invalid RTF: Tokens not ascii encoded.\n%s') % str(msg) + raise self.__exception_handler, msg line = self.process_cw(token) if line is not None: write_obj.write(line)