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

Merge pull request #50 from Easy-D/preserve-regular-blockquotes

Browse Source 
Preserve regular blockquotes
This commit is contained in:
Sergey Obukhov
2015-09-11 04:49:36 -07:00
parent 567549cba4 390b0a6dc9
commit cc98befba5
2 changed files with 22 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
talon/html_quotations.py
View File

@@ -138,9 +138,10 @@ def cut_by_id(html_message):
def cut_blockquote(html_message): def cut_blockquote(html_message):
''' Cuts blockquote with wrapping elements. ''' ''' Cuts the last non-nested blockquote with wrapping elements. '''
quote = html_message.find('.//blockquote') quote = html_message.xpath('(.//blockquote)[not(ancestor::blockquote)][last()]')
if quote is not None: if quote:
quote = quote[0]
quote.getparent().remove(quote) quote.getparent().remove(quote)
return True return True

18
tests/html_quotations_test.py
View File

@@ -49,6 +49,24 @@ def test_quotation_splitter_outside_blockquote():
RE_WHITESPACE.sub('', quotations.extract_from_html(msg_body))) RE_WHITESPACE.sub('', quotations.extract_from_html(msg_body)))
def test_regular_blockquote():
msg_body = """Reply
<blockquote>Regular</blockquote>
<div>
On 11-Apr-2011, at 6:54 PM, Bob &lt;bob@example.com&gt; wrote:
</div>
<blockquote>
<div>
<blockquote>Nested</blockquote>
</div>
</blockquote>
"""
eq_("<html><body><p>Reply</p><blockquote>Regular</blockquote><div></div></body></html>",
RE_WHITESPACE.sub('', quotations.extract_from_html(msg_body)))
def test_no_blockquote(): def test_no_blockquote():
msg_body = """ msg_body = """
<html> <html>