diff --git a/talon/html_quotations.py b/talon/html_quotations.py index a2db32d5..d440f8f4 100644 --- a/talon/html_quotations.py +++ b/talon/html_quotations.py @@ -85,6 +85,14 @@ def cut_gmail_quote(html_message): return True +def cut_yahoo_quote(html_message): + ''' Cuts the outermost block element with class yahoo_quoted. ''' + yahoo_quote = cssselect('div.yahoo_quoted', html_message) + if yahoo_quote and (yahoo_quote[0].text is None or not RE_FWD.match(yahoo_quote[0].text)): + yahoo_quote[0].getparent().remove(yahoo_quote[0]) + return True + + def cut_microsoft_quote(html_message): ''' Cuts splitter block and all following blocks. ''' #use EXSLT extensions to have a regex match() function with lxml diff --git a/talon/quotations.py b/talon/quotations.py index b244c6c0..0f11633d 100644 --- a/talon/quotations.py +++ b/talon/quotations.py @@ -446,6 +446,7 @@ def extract_from_html_tree(html_tree): then deleting necessary tags. """ cut_quotations = (html_quotations.cut_gmail_quote(html_tree) or + html_quotations.cut_yahoo_quote(html_tree) or html_quotations.cut_zimbra_quote(html_tree) or html_quotations.cut_blockquote(html_tree) or html_quotations.cut_microsoft_quote(html_tree) or diff --git a/tests/fixtures/html_replies/yahoo.html b/tests/fixtures/html_replies/yahoo.html new file mode 100644 index 00000000..c7b72d87 --- /dev/null +++ b/tests/fixtures/html_replies/yahoo.html @@ -0,0 +1 @@ +
Hi. I am fine.

Thanks,
Alex



On Tuesday, June 4, 2019, 5:41:43 PM PDT, John Smith <jsmith@example.com> wrote:


Hello! How are you?
diff --git a/tests/html_quotations_test.py b/tests/html_quotations_test.py index 85871e73..6f038a57 100644 --- a/tests/html_quotations_test.py +++ b/tests/html_quotations_test.py @@ -160,6 +160,27 @@ def test_gmail_quote_blockquote(): RE_WHITESPACE.sub('', quotations.extract_from_html(msg_body))) +def test_yahoo_quote(): + msg_body = """Reply +
+
+
+ On Tuesday, June 4, 2019, 5:41:43 PM PDT, John Smith <jsmith@example.com> wrote: +
+

+

+
+
+
Test
+
+
+
+
+""" + eq_("Reply", + RE_WHITESPACE.sub('', quotations.extract_from_html(msg_body))) + + def test_unicode_in_reply(): msg_body = u"""Reply \xa0 \xa0 Text
@@ -326,6 +347,10 @@ def test_gmail_reply(): extract_reply_and_check("tests/fixtures/html_replies/gmail.html") +def test_yahoo_reply(): + extract_reply_and_check("tests/fixtures/html_replies/yahoo.html") + + def test_mail_ru_reply(): extract_reply_and_check("tests/fixtures/html_replies/mail_ru.html")