o2w/talon
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into sergey/empty-html

Browse Source
This commit is contained in:
Sergey Obukhov
2016-08-11 23:58:11 -07:00
parent 315eaa7080 b085e3d049
commit 69a44b10a1
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
talon/quotations.py
View File

@@ -391,7 +391,7 @@ def _extract_from_html(msg_body):
if msg_body.strip() == b'': if msg_body.strip() == b'':
return msg_body 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( html_tree = html.document_fromstring(
msg_body, msg_body,
parser=html.HTMLParser(encoding="utf-8") parser=html.HTMLParser(encoding="utf-8")

7
tests/html_quotations_test.py
View File

@@ -356,7 +356,8 @@ def test_CRLF():
assert_false(symbol in extracted) assert_false(symbol in extracted)
eq_('<html></html>', RE_WHITESPACE.sub('', extracted)) eq_('<html></html>', RE_WHITESPACE.sub('', extracted))
msg_body = """Reply msg_body = """My
reply
<blockquote> <blockquote>
<div> <div>
@@ -371,8 +372,8 @@ def test_CRLF():
msg_body = msg_body.replace('\n', '\r\n') msg_body = msg_body.replace('\n', '\r\n')
extracted = quotations.extract_from_html(msg_body) extracted = quotations.extract_from_html(msg_body)
assert_false(symbol in extracted) assert_false(symbol in extracted)
eq_("<html><body><p>Reply</p></body></html>", # Keep new lines otherwise "My reply" becomes one word - "Myreply"
RE_WHITESPACE.sub('', extracted)) eq_("<html><body><p>My\nreply\n</p></body></html>", extracted)
def test_gmail_forwarded_msg(): def test_gmail_forwarded_msg():