github
/
apprise
mirror of https://github.com/caronc/apprise
1
0
Fork 0
Code Issues Releases Wiki Activity

Escape new lines for TEXT->HTML conversions (#617)

pull/623/head
Chris Caron 2022-07-01 09:31:06 -04:00 committed by GitHub
parent 1519e98cda
commit e95484349e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apprise/URLBase.py
View File

@ -359,7 +359,7 @@ class URLBase(object):
.replace(u' ', u' ') .replace(u' ', u' ')
if convert_new_lines: if convert_new_lines:
return escaped.replace(u'\n', u'&lt;br/&gt;') return escaped.replace(u'\n', u'<br/>')
return escaped return escaped

3
apprise/conversion.py
View File

@ -70,7 +70,8 @@ def text_to_html(content):
Converts specified content from plain text to HTML. 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): def html_to_text(content):

2
test/test_notify_base.py
View File

@ -183,7 +183,7 @@ def test_notify_base():
assert NotifyBase.escape_html( assert NotifyBase.escape_html(
"<content>'\t \n</content>", convert_new_lines=True) == \ "<content>'\t \n</content>", convert_new_lines=True) == \
'&lt;content&gt;&apos;&emsp;&nbsp;&lt;br/&gt;&lt;/content&gt;' '&lt;content&gt;&apos;&emsp;&nbsp;<br/>&lt;/content&gt;'
# Test invalid data # Test invalid data
assert NotifyBase.split_path(None) == [] assert NotifyBase.split_path(None) == []