From 037e28a442d3fb2eae1333994cedb1e59808c169 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Mon, 20 May 2019 15:24:05 +0530 Subject: [PATCH] py3: misc fixes for RTF input --- src/calibre/ebooks/conversion/plugins/rtf_input.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/calibre/ebooks/conversion/plugins/rtf_input.py b/src/calibre/ebooks/conversion/plugins/rtf_input.py index bd6edd0421..b8b4d50604 100644 --- a/src/calibre/ebooks/conversion/plugins/rtf_input.py +++ b/src/calibre/ebooks/conversion/plugins/rtf_input.py @@ -5,7 +5,7 @@ __copyright__ = '2008, Kovid Goyal ' import os, glob, re, textwrap from calibre.customize.conversion import InputFormatPlugin, OptionRecommendation -from polyglot.builtins import iteritems, filter, getcwd +from polyglot.builtins import iteritems, filter, getcwd, as_bytes border_style_map = { 'single' : 'solid', @@ -215,7 +215,7 @@ class RTFInput(InputFormatPlugin): css += '\n\n.%s {\n%s\n}'%(cls, val) with open(u'styles.css', 'ab') as f: - f.write(css) + f.write(css.encode('utf-8')) def convert_borders(self, doc): border_styles = [] @@ -295,7 +295,7 @@ class RTFInput(InputFormatPlugin): # res = re.sub('\s*', '', res) # res = re.sub('(?<=\n)\n{2}', # u'

\u00a0

\n'.encode('utf-8'), res) - f.write(res) + f.write(as_bytes(res)) self.write_inline_css(inline_class, border_styles) stream.seek(0) mi = get_metadata(stream, 'rtf')