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

Commit90e4348

Browse files
committed
Move Genshi tree adapter to be in the public API, because sanity.
1 parentf4490be commit90e4348

File tree

3 files changed

+65
-49
lines changed

3 files changed

+65
-49
lines changed

‎html5lib/tests/test_treewalkers.py‎

Lines changed: 3 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
from .supportimportget_data_files,TestData,convertExpected
1515

16-
fromhtml5libimporthtml5parser,treewalkers,treebuilders,constants
16+
fromhtml5libimporthtml5parser,treewalkers,treebuilders,treeadapters,constants
1717

1818

1919
defPullDOMAdapter(node):
@@ -84,59 +84,13 @@ def PullDOMAdapter(node):
8484

8585

8686
try:
87-
fromgenshi.coreimportQName,Attrs
88-
fromgenshi.coreimportSTART,END,TEXT,COMMENT,DOCTYPE
87+
importgenshi# flake8: noqa
8988
exceptImportError:
9089
pass
9190
else:
92-
defGenshiAdapter(tree):
93-
text=None
94-
fortokenintreewalkers.getTreeWalker("dom")(tree):
95-
type=token["type"]
96-
iftypein ("Characters","SpaceCharacters"):
97-
iftextisNone:
98-
text=token["data"]
99-
else:
100-
text+=token["data"]
101-
eliftextisnotNone:
102-
yieldTEXT,text, (None,-1,-1)
103-
text=None
104-
105-
iftypein ("StartTag","EmptyTag"):
106-
iftoken["namespace"]:
107-
name="{%s}%s"% (token["namespace"],token["name"])
108-
else:
109-
name=token["name"]
110-
attrs=Attrs([(QName("{%s}%s"%attrifattr[0]isnotNoneelseattr[1]),value)
111-
forattr,valueintoken["data"].items()])
112-
yield (START, (QName(name),attrs), (None,-1,-1))
113-
iftype=="EmptyTag":
114-
type="EndTag"
115-
116-
iftype=="EndTag":
117-
iftoken["namespace"]:
118-
name="{%s}%s"% (token["namespace"],token["name"])
119-
else:
120-
name=token["name"]
121-
122-
yieldEND,QName(name), (None,-1,-1)
123-
124-
eliftype=="Comment":
125-
yieldCOMMENT,token["data"], (None,-1,-1)
126-
127-
eliftype=="Doctype":
128-
yieldDOCTYPE, (token["name"],token["publicId"],
129-
token["systemId"]), (None,-1,-1)
130-
131-
else:
132-
pass# FIXME: What to do?
133-
134-
iftextisnotNone:
135-
yieldTEXT,text, (None,-1,-1)
136-
13791
treeTypes["genshi"]= \
13892
{"builder":treebuilders.getTreeBuilder("dom"),
139-
"adapter":GenshiAdapter,
93+
"adapter":lambdatree:treeadapters.genshi.to_genshi(treewalkers.getTreeWalker("dom")(tree)),
14094
"walker":treewalkers.getTreeWalker("genshi")}
14195

14296
importre

‎html5lib/treeadapters/__init__.py‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
from __future__importabsolute_import,division,unicode_literals
2+
3+
from .importsax
4+
5+
__all__= ["sax"]
6+
7+
try:
8+
from .importgenshi# flake8: noqa
9+
exceptImportError:
10+
pass
11+
else:
12+
__all__.append("genshi")

‎html5lib/treeadapters/genshi.py‎

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
from __future__importabsolute_import,division,unicode_literals
2+
3+
fromgenshi.coreimportQName,Attrs
4+
fromgenshi.coreimportSTART,END,TEXT,COMMENT,DOCTYPE
5+
6+
7+
defto_genshi(walker):
8+
text=None
9+
fortokeninwalker:
10+
type=token["type"]
11+
iftypein ("Characters","SpaceCharacters"):
12+
iftextisNone:
13+
text=token["data"]
14+
else:
15+
text+=token["data"]
16+
eliftextisnotNone:
17+
yieldTEXT,text, (None,-1,-1)
18+
text=None
19+
20+
iftypein ("StartTag","EmptyTag"):
21+
iftoken["namespace"]:
22+
name="{%s}%s"% (token["namespace"],token["name"])
23+
else:
24+
name=token["name"]
25+
attrs=Attrs([(QName("{%s}%s"%attrifattr[0]isnotNoneelseattr[1]),value)
26+
forattr,valueintoken["data"].items()])
27+
yield (START, (QName(name),attrs), (None,-1,-1))
28+
iftype=="EmptyTag":
29+
type="EndTag"
30+
31+
iftype=="EndTag":
32+
iftoken["namespace"]:
33+
name="{%s}%s"% (token["namespace"],token["name"])
34+
else:
35+
name=token["name"]
36+
37+
yieldEND,QName(name), (None,-1,-1)
38+
39+
eliftype=="Comment":
40+
yieldCOMMENT,token["data"], (None,-1,-1)
41+
42+
eliftype=="Doctype":
43+
yieldDOCTYPE, (token["name"],token["publicId"],
44+
token["systemId"]), (None,-1,-1)
45+
46+
else:
47+
pass# FIXME: What to do?
48+
49+
iftextisnotNone:
50+
yieldTEXT,text, (None,-1,-1)

0 commit comments

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