Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commita4fc4d8

Browse files
committed
Move default_etree to utils.py and use it for the treewalker too.
1 parent6c54f20 commita4fc4d8

File tree

3 files changed

+13
-7
lines changed

3 files changed

+13
-7
lines changed

‎html5lib/treebuilders/__init__.py

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@
2828

2929
from __future__importabsolute_import,division,unicode_literals
3030

31+
from ..utilsimportdefault_etree
32+
3133
treeBuilderCache= {}
3234

3335

@@ -64,14 +66,9 @@ def getTreeBuilder(treeType, implementation=None, **kwargs):
6466
from .importetree_lxml
6567
treeBuilderCache[treeType]=etree_lxml.TreeBuilder
6668
eliftreeType=="etree":
67-
# Come up with a sane default (pref. from the stdlib)
68-
ifimplementationisNone:
69-
try:
70-
importxml.etree.cElementTreeasET
71-
exceptImportError:
72-
importxml.etree.ElementTreeasET
73-
implementation=ET
7469
from .importetree
70+
ifimplementationisNone:
71+
implementation=default_etree
7572
# NEVER cache here, caching is done in the etree submodule
7673
returnetree.getETreeModule(implementation,**kwargs).TreeBuilder
7774
else:

‎html5lib/treewalkers/__init__.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212

1313
importsys
1414

15+
from ..utilsimportdefault_etree
16+
1517
treeWalkerCache= {}
1618

1719

@@ -48,6 +50,8 @@ def getTreeWalker(treeType, implementation=None, **kwargs):
4850
treeWalkerCache[treeType]=lxmletree.TreeWalker
4951
eliftreeType=="etree":
5052
from .importetree
53+
ifimplementationisNone:
54+
implementation=default_etree
5155
# XXX: NEVER cache here, caching is done in the etree submodule
5256
returnetree.getETreeModule(implementation,**kwargs).TreeWalker
5357
returntreeWalkerCache.get(treeType)

‎html5lib/utils.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@
22

33
fromtypesimportModuleType
44

5+
try:
6+
importxml.etree.cElementTreeasdefault_etree
7+
exceptImportError:
8+
importxml.etree.ElementTreeasdefault_etree
9+
510

611
classMethodDispatcher(dict):
712
"""Dict with 2 special properties:

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp