Merge branch 'master' into sergey/empty-html

2016-08-11 23:58:11 -07:00
parent 315eaa7080 b085e3d049
commit 69a44b10a1
2 changed files with 5 additions and 4 deletions
--- a/talon/quotations.py
+++ b/talon/quotations.py
@@ -391,7 +391,7 @@ def _extract_from_html(msg_body):
    if msg_body.strip() == b'':
        return msg_body

-    msg_body = msg_body.replace(b'\r\n', b'').replace(b'\n', b'')
+    msg_body = msg_body.replace(b'\r\n', b'\n')
    html_tree = html.document_fromstring(
        msg_body,
        parser=html.HTMLParser(encoding="utf-8")