From 85cadf7ed500602155ff910e064329c11220559b Mon Sep 17 00:00:00 2001 From: Sergey Lavrinenko Date: Wed, 1 Apr 2015 23:10:52 +0300 Subject: [PATCH] Replace \r\n to \n in Transformer html. Fixes #48 --- emails/testsuite/transformer/test_transformer.py | 3 +++ emails/transformer.py | 8 +++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/emails/testsuite/transformer/test_transformer.py b/emails/testsuite/transformer/test_transformer.py index c675ae8..d42c035 100644 --- a/emails/testsuite/transformer/test_transformer.py +++ b/emails/testsuite/transformer/test_transformer.py @@ -29,6 +29,9 @@ def test_image_apply(): assert after in t.to_string() +def test_entity_13(): + assert Transformer(html="
x\r\n
").to_string() == '
x\n
' + def test_link_apply(): diff --git a/emails/transformer.py b/emails/transformer.py index e220fee..fcb49a5 100644 --- a/emails/transformer.py +++ b/emails/transformer.py @@ -63,7 +63,12 @@ class HTMLParser(object): _xml_title_regex = re.compile(r'\', re.IGNORECASE) def __init__(self, html, method="html", output_method="xml"): - self._html = html + + if output_method == 'xml': + self._html = html.replace('\r\n', '\n') + else: + self._html = html + self._method = method self._output_method = output_method self._tree = None @@ -334,6 +339,7 @@ class BaseTransformer(HTMLParser): return self + class Transformer(BaseTransformer): pass