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

py3: misc fixes for RTF input

Browse Source
This commit is contained in:
Kovid Goyal 2019-05-20 15:24:05 +05:30
parent 27580b8cbe
commit 037e28a442
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/calibre/ebooks/conversion/plugins/rtf_input.py
View File

@ -5,7 +5,7 @@ __copyright__ = '2008, Kovid Goyal <kovid at kovidgoyal.net>'
import os, glob, re, textwrap import os, glob, re, textwrap
from calibre.customize.conversion import InputFormatPlugin, OptionRecommendation 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 = { border_style_map = {
'single' : 'solid', 'single' : 'solid',
@ -215,7 +215,7 @@ class RTFInput(InputFormatPlugin):
css += '\n\n.%s {\n%s\n}'%(cls, val) css += '\n\n.%s {\n%s\n}'%(cls, val)
with open(u'styles.css', 'ab') as f: with open(u'styles.css', 'ab') as f:
f.write(css) f.write(css.encode('utf-8'))
def convert_borders(self, doc): def convert_borders(self, doc):
border_styles = [] border_styles = []
@ -295,7 +295,7 @@ class RTFInput(InputFormatPlugin):
# res = re.sub('\s*<body>', '<body>', res) # res = re.sub('\s*<body>', '<body>', res)
# res = re.sub('(?<=\n)\n{2}', # res = re.sub('(?<=\n)\n{2}',
# u'<p>\u00a0</p>\n'.encode('utf-8'), res) # u'<p>\u00a0</p>\n'.encode('utf-8'), res)
f.write(res) f.write(as_bytes(res))
self.write_inline_css(inline_class, border_styles) self.write_inline_css(inline_class, border_styles)
stream.seek(0) stream.seek(0)
mi = get_metadata(stream, 'rtf') mi = get_metadata(stream, 'rtf')