diff options
author | Waylan Limberg <waylan.limberg@icloud.com> | 2014-11-20 16:07:03 -0500 |
---|---|---|
committer | Waylan Limberg <waylan.limberg@icloud.com> | 2014-11-20 16:07:03 -0500 |
commit | 8f66a94eab1389d97041944ed24afd2bf7c4389c (patch) | |
tree | 10b53664076650be951468cbbb163f3d637e5891 /markdown/serializers.py | |
parent | 0c2143819ef7de53be52f7a4d47e027ff194a9b4 (diff) | |
download | markdown-8f66a94eab1389d97041944ed24afd2bf7c4389c.tar.gz markdown-8f66a94eab1389d97041944ed24afd2bf7c4389c.tar.bz2 markdown-8f66a94eab1389d97041944ed24afd2bf7c4389c.zip |
Flake8 cleanup (mostly whitespace).
Got all but a couple files in the tests (ran out of time today).
Apparently I have been using some bad form for years (although a few
things seemed to look better before the update). Anyway, conformant now.
Diffstat (limited to 'markdown/serializers.py')
-rw-r--r-- | markdown/serializers.py | 32 |
1 files changed, 19 insertions, 13 deletions
diff --git a/markdown/serializers.py b/markdown/serializers.py index f53ae31..1e8d9dd 100644 --- a/markdown/serializers.py +++ b/markdown/serializers.py @@ -42,9 +42,9 @@ from __future__ import unicode_literals from . import util ElementTree = util.etree.ElementTree QName = util.etree.QName -if hasattr(util.etree, 'test_comment'): #pragma: no cover +if hasattr(util.etree, 'test_comment'): # pragma: no cover Comment = util.etree.test_comment -else: #pragma: no cover +else: # pragma: no cover Comment = util.etree.Comment PI = util.etree.PI ProcessingInstruction = util.etree.ProcessingInstruction @@ -56,7 +56,7 @@ HTML_EMPTY = ("area", "base", "basefont", "br", "col", "frame", "hr", try: HTML_EMPTY = set(HTML_EMPTY) -except NameError: #pragma: no cover +except NameError: # pragma: no cover pass _namespace_map = { @@ -73,17 +73,19 @@ _namespace_map = { } -def _raise_serialization_error(text): #pragma: no cover +def _raise_serialization_error(text): # pragma: no cover raise TypeError( "cannot serialize %r (type %s)" % (text, type(text).__name__) ) + def _encode(text, encoding): try: return text.encode(encoding, "xmlcharrefreplace") - except (TypeError, AttributeError): #pragma: no cover + except (TypeError, AttributeError): # pragma: no cover _raise_serialization_error(text) + def _escape_cdata(text): # escape character data try: @@ -97,7 +99,7 @@ def _escape_cdata(text): if ">" in text: text = text.replace(">", ">") return text - except (TypeError, AttributeError): #pragma: no cover + except (TypeError, AttributeError): # pragma: no cover _raise_serialization_error(text) @@ -115,9 +117,10 @@ def _escape_attrib(text): if "\n" in text: text = text.replace("\n", " ") return text - except (TypeError, AttributeError): #pragma: no cover + except (TypeError, AttributeError): # pragma: no cover _raise_serialization_error(text) + def _escape_attrib_html(text): # escape attribute value try: @@ -130,7 +133,7 @@ def _escape_attrib_html(text): if "\"" in text: text = text.replace("\"", """) return text - except (TypeError, AttributeError): #pragma: no cover + except (TypeError, AttributeError): # pragma: no cover _raise_serialization_error(text) @@ -152,7 +155,7 @@ def _serialize_html(write, elem, qnames, namespaces, format): write("<" + tag) items = elem.items() if items or namespaces: - items = sorted(items) # lexical order + items = sorted(items) # lexical order for k, v in items: if isinstance(k, QName): k = k.text @@ -167,7 +170,7 @@ def _serialize_html(write, elem, qnames, namespaces, format): write(" %s=\"%s\"" % (qnames[k], v)) if namespaces: items = namespaces.items() - items.sort(key=lambda x: x[1]) # sort on prefix + items.sort(key=lambda x: x[1]) # sort on prefix for v, k in items: if k: k = ":" + k @@ -188,6 +191,7 @@ def _serialize_html(write, elem, qnames, namespaces, format): if elem.tail: write(_escape_cdata(elem.tail)) + def _write_html(root, encoding=None, default_namespace=None, @@ -232,7 +236,7 @@ def _namespaces(elem, default_namespace=None): if prefix: qnames[qname] = "%s:%s" % (prefix, tag) else: - qnames[qname] = tag # default element + qnames[qname] = tag # default element else: if default_namespace: raise ValueError( @@ -240,14 +244,14 @@ def _namespaces(elem, default_namespace=None): "default_namespace option" ) qnames[qname] = qname - except TypeError: #pragma: no cover + except TypeError: # pragma: no cover _raise_serialization_error(qname) # populate qname and namespaces table try: iterate = elem.iter except AttributeError: - iterate = elem.getiterator # cET compatibility + iterate = elem.getiterator # cET compatibility for elem in iterate(): tag = elem.tag if isinstance(tag, QName) and tag.text not in qnames: @@ -269,8 +273,10 @@ def _namespaces(elem, default_namespace=None): add_qname(text.text) return qnames, namespaces + def to_html_string(element): return _write_html(ElementTree(element).getroot(), format="html") + def to_xhtml_string(element): return _write_html(ElementTree(element).getroot(), format="xhtml") |