From e95484349e948d0ee92d43e2bb464bb0d79871b2 Mon Sep 17 00:00:00 2001 From: Chris Caron Date: Fri, 1 Jul 2022 09:31:06 -0400 Subject: [PATCH] Escape new lines for TEXT->HTML conversions (#617) --- apprise/URLBase.py | 2 +- apprise/conversion.py | 3 ++- test/test_notify_base.py | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/apprise/URLBase.py b/apprise/URLBase.py index f5428dbb..bc653b97 100644 --- a/apprise/URLBase.py +++ b/apprise/URLBase.py @@ -359,7 +359,7 @@ class URLBase(object): .replace(u' ', u' ') if convert_new_lines: - return escaped.replace(u'\n', u'<br/>') + return escaped.replace(u'\n', u'
') return escaped diff --git a/apprise/conversion.py b/apprise/conversion.py index bb192e7e..075fcd32 100644 --- a/apprise/conversion.py +++ b/apprise/conversion.py @@ -70,7 +70,8 @@ def text_to_html(content): Converts specified content from plain text to HTML. """ - return URLBase.escape_html(content) + # First eliminate any carriage returns + return URLBase.escape_html(content, convert_new_lines=True) def html_to_text(content): diff --git a/test/test_notify_base.py b/test/test_notify_base.py index fe5e2c8d..2ad14462 100644 --- a/test/test_notify_base.py +++ b/test/test_notify_base.py @@ -183,7 +183,7 @@ def test_notify_base(): assert NotifyBase.escape_html( "'\t \n", convert_new_lines=True) == \ - '<content>'  <br/></content>' + '<content>'  
</content>' # Test invalid data assert NotifyBase.split_path(None) == []