10000 Move serializer.htmlserializer to serializer · athana/html5lib-python@6c30d0b · GitHub
[go: up one dir, main page]
Skip to content

Commit 6c30d0b

Browse files
gsneddersgsnedders
committed
Move serializer.htmlserializer to serializer
The directory has long been pretty redundant, so let's just kill it.
1 parent 7bbde54 commit 6c30d0b

File tree

2 files changed

+15
-24
lines changed

2 files changed

+15
-24
lines changed

‎html5lib/serializer/htmlserializer.py renamed to ‎html5lib/serializer.py

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55

66
from codecs import register_error, xmlcharrefreplace_errors
77

8-
from ..constants import voidElements, booleanAttributes, spaceCharacters
9-
from ..constants import rcdataElements, entities, xmlEntities
10-
from .. import utils
8+
from .constants import voidElements, booleanAttributes, spaceCharacters
9+
from .constants import rcdataElements, entities, xmlEntities
10+
from . import treewalkers, utils
1111
from xml.sax.saxutils import escape
1212

1313
spaceCharacters = "".join(spaceCharacters)
@@ -73,6 +73,13 @@ def htmlentityreplace_errors(exc):
7373
register_error("htmlentityreplace", htmlentityreplace_errors)
7474

7575

76+
def serialize(input, tree="etree", encoding=None, **serializer_opts):
77+
# XXX: Should we cache this?
78+
walker = treewalkers.getTreeWalker(tree)
79+
s = HTMLSerializer(**serializer_opts)
80+
return s.render(walker(input), encoding)
81+
82+
7683
class HTMLSerializer(object):
7784

7885
# attribute quoting options
@@ -181,24 +188,24 @@ def serialize(self, treewalker, encoding=None):
181188
self.errors = []
182189

183190
if encoding and self.inject_meta_charset:
184-
from ..filters.inject_meta_charset import Filter
191+
from .filters.inject_meta_charset import Filter
185192
treewalker = Filter(treewalker, encoding)
186193
# Alphabetical attributes is here under the assumption that none of
187194
# the later filters add or change order of attributes; it needs to be
188195
# before the sanitizer so escaped elements come out correctly
189196
if self.alphabetical_attributes:
190-
from ..filters.alphabeticalattributes import Filter
197+
from .filters.alphabeticalattributes import Filter
191198
treewalker = Filter(treewalker)
192199
# WhitespaceFilter should be used before OptionalTagFilter
193200
# for maximum efficiently of this latter filter
194201
if self.strip_whitespace:
195-
from ..filters.whitespace import Filter
202+
from .filters.whitespace import Filter
196203
treewalker = Filter(treewalker)
197204
if self.sanitize:
198-
from ..filters.sanitizer import Filter
205+
from .filters.sanitizer import Filter
199206
treewalker = Filter(treewalker)
200207
if self.omit_optional_tags:
201-
from ..filters.optionaltags import Filter
208+
from .filters.optionaltags import Filter
202209
treewalker = Filter(treewalker)
203210

204211
for token in treewalker:

‎html5lib/serializer/__init__.py

Lines changed: 0 additions & 16 deletions
This file was deleted.

0 commit comments

Comments
 (0)
0