Commitb2b08cc

committed

Get lxml treewalker outputting attrs in source order again

Mostly so we have test coverage here on < 3.7

1 parent38ec086 commitb2b08ccCopy full SHA for b2b08cc

File tree

-3

lines changed

-3

lines changed

Lines changed: 6 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -141,7 +141,9 @@ def test_lxml_xml():`
`141`	`141`
`142`	`142`	`@pytest.mark.parametrize("treeName",`
`143`	`143`	`[pytest.param(treeName,marks=[getattr(pytest.mark,treeName),`
`144`		`-pytest.mark.skipif(sys.version_info< (3,7),reason="dict order undef")])`
	`144`	`+pytest.mark.skipif(`
	`145`	`+treeName!="lxml"or`
	`146`	`+sys.version_info< (3,7),reason="dict order undef")])`
`145`	`147`	`fortreeNameinsorted(treeTypes.keys())])`
`146`	`148`	`deftest_maintain_attribute_order(treeName):`
`147`	`149`	`treeAPIs=treeTypes[treeName]`
`@@ -172,7 +174,9 @@ def test_maintain_attribute_order(treeName):`
`172`	`174`
`173`	`175`	`@pytest.mark.parametrize("treeName",`
`174`	`176`	`[pytest.param(treeName,marks=[getattr(pytest.mark,treeName),`
`175`		`-pytest.mark.skipif(sys.version_info< (3,7),reason="dict order undef")])`
	`177`	`+pytest.mark.skipif(`
	`178`	`+treeName!="lxml"or`
	`179`	`+sys.version_info< (3,7),reason="dict order undef")])`
`176`	`180`	`fortreeNameinsorted(treeTypes.keys())])`
`177`	`181`	`deftest_maintain_attribute_order_adjusted(treeName):`
`178`	`182`	`treeAPIs=treeTypes[treeName]`

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,8 @@`
`1`	`1`	`from __future__importabsolute_import,division,unicode_literals`
`2`	`2`	`fromsiximporttext_type`
`3`	`3`
	`4`	`+fromcollectionsimportOrderedDict`
	`5`	`+`
`4`	`6`	`fromlxmlimportetree`
`5`	`7`	`from ..treebuilders.etreeimporttag_regexp`
`6`	`8`
`@@ -163,7 +165,7 @@ def getNodeDetails(self, node):`
`163`	`165`	`else:`
`164`	`166`	`namespace=None`
`165`	`167`	`tag=ensure_str(node.tag)`
`166`		`-attrs={}`
	`168`	`+attrs=OrderedDict()`
`167`	`169`	`forname,valueinlist(node.attrib.items()):`
`168`	`170`	`name=ensure_str(name)`
`169`	`171`	`value=ensure_str(value)`

Comments

(0)