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

Merge branch 'master' of https://github.com/JimmXinu/calibre

Browse Source
This commit is contained in:
Kovid Goyal 2015-11-20 09:53:17 +05:30
commit 45e732332d
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/calibre/library/comments.py
View File

@ -134,6 +134,8 @@ def merge_comments(one, two):
return comments_to_html(one) + '\n\n' + comments_to_html(two) return comments_to_html(one) + '\n\n' + comments_to_html(two)
def sanitize_html(html): def sanitize_html(html):
if not html:
return u''
if isinstance(html, bytes): if isinstance(html, bytes):
html = html.decode('utf-8', 'replace') html = html.decode('utf-8', 'replace')
import html5lib import html5lib