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

Commit14d4851

Browse files
authored
Merge pull request#275 from gsnedders/attr_order
Fix attribute order
2 parentsa3b8252 +983a935 commit14d4851

File tree

4 files changed

+40
-6
lines changed

4 files changed

+40
-6
lines changed

‎CHANGES.rst‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,10 @@ Change Log
44
0.999999999/1.0b10
55
~~~~~~~~~~~~~~~~~~
66

7-
Released onXXX
7+
Released onJuly 15, 2016
88

9-
* XXX
9+
* Fix attribute order going to the tree builder to be document order
10+
instead of reverse document order(!).
1011

1112

1213
0.99999999/1.0b9

‎html5lib/__init__.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,4 @@
2222
"getTreeWalker","serialize"]
2323

2424
# this has to be at the top level, see how setup.py parses this
25-
__version__="0.999999999-dev"
25+
__version__="0.9999999999-dev"

‎html5lib/html5parser.py‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,11 @@ def normalizeToken(self, token):
265265
""" HTML5 specific normalizations to the token stream """
266266

267267
iftoken["type"]==tokenTypes["StartTag"]:
268-
token["data"]=OrderedDict(token['data'][::-1])
268+
raw=token["data"]
269+
token["data"]=OrderedDict(raw)
270+
iflen(raw)>len(token["data"]):
271+
# we had some duplicated attribute, fix so first wins
272+
token["data"].update(raw[::-1])
269273

270274
returntoken
271275

‎html5lib/tests/test_parser2.py‎

Lines changed: 31 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
from __future__importabsolute_import,division,unicode_literals
22

3-
fromsiximportPY2,text_type
3+
fromsiximportPY2,text_type,unichr
44

55
importio
66

77
from .importsupport# noqa
88

9-
fromhtml5lib.constantsimportnamespaces
9+
fromhtml5lib.constantsimportnamespaces,tokenTypes
1010
fromhtml5libimportparse,parseFragment,HTMLParser
1111

1212

@@ -53,13 +53,42 @@ def test_unicode_file():
5353
assertparse(io.StringIO("a"))isnotNone
5454

5555

56+
deftest_maintain_attribute_order():
57+
# This is here because we impl it in parser and not tokenizer
58+
p=HTMLParser()
59+
# generate loads to maximize the chance a hash-based mutation will occur
60+
attrs= [(unichr(x),i)fori,xinenumerate(range(ord('a'),ord('z')))]
61+
token= {'name':'html',
62+
'selfClosing':False,
63+
'selfClosingAcknowledged':False,
64+
'type':tokenTypes["StartTag"],
65+
'data':attrs}
66+
out=p.normalizeToken(token)
67+
attr_order=list(out["data"].keys())
68+
assertattr_order== [xforx,iinattrs]
69+
70+
5671
deftest_duplicate_attribute():
5772
# This is here because we impl it in parser and not tokenizer
5873
doc=parse('<p class=a class=b>')
5974
el=doc[1][0]
6075
assertel.get("class")=="a"
6176

6277

78+
deftest_maintain_duplicate_attribute_order():
79+
# This is here because we impl it in parser and not tokenizer
80+
p=HTMLParser()
81+
attrs= [(unichr(x),i)fori,xinenumerate(range(ord('a'),ord('z')))]
82+
token= {'name':'html',
83+
'selfClosing':False,
84+
'selfClosingAcknowledged':False,
85+
'type':tokenTypes["StartTag"],
86+
'data':attrs+ [('a',len(attrs))]}
87+
out=p.normalizeToken(token)
88+
attr_order=list(out["data"].keys())
89+
assertattr_order== [xforx,iinattrs]
90+
91+
6392
deftest_debug_log():
6493
parser=HTMLParser(debug=True)
6594
parser.parse("<!doctype html><title>a</title><p>b<script>c</script>d</p>e")

0 commit comments

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