Get lxml treewalker outputting attrs in source order again

Mostly so we have test coverage here on < 3.7
html5lib · Jun 17, 2020 · b2b08cc · b2b08cc
1 parent 38ec086
commit b2b08cc
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/html5lib/tests/test_treewalkers.py b/html5lib/tests/test_treewalkers.py
@@ -141,7 +141,9 @@ def test_lxml_xml():
 
 @pytest.mark.parametrize("treeName",
                          [pytest.param(treeName, marks=[getattr(pytest.mark, treeName),
-                                                        pytest.mark.skipif(sys.version_info < (3, 7), reason="dict order undef")])
+                                                        pytest.mark.skipif(
+                                                            treeName != "lxml" or
+                                                            sys.version_info < (3, 7), reason="dict order undef")])
                           for treeName in sorted(treeTypes.keys())])
 def test_maintain_attribute_order(treeName):
     treeAPIs = treeTypes[treeName]
@@ -172,7 +174,9 @@ def test_maintain_attribute_order(treeName):
 
 @pytest.mark.parametrize("treeName",
                          [pytest.param(treeName, marks=[getattr(pytest.mark, treeName),
-                                                        pytest.mark.skipif(sys.version_info < (3, 7), reason="dict order undef")])
+                                                        pytest.mark.skipif(
+                                                            treeName != "lxml" or
+                                                            sys.version_info < (3, 7), reason="dict order undef")])
                           for treeName in sorted(treeTypes.keys())])
 def test_maintain_attribute_order_adjusted(treeName):
     treeAPIs = treeTypes[treeName]

diff --git a/html5lib/treewalkers/etree_lxml.py b/html5lib/treewalkers/etree_lxml.py
@@ -1,6 +1,8 @@
 from __future__ import absolute_import, division, unicode_literals
 from six import text_type
 
+from collections import OrderedDict
+
 from lxml import etree
 from ..treebuilders.etree import tag_regexp
 
@@ -163,7 +165,7 @@ def getNodeDetails(self, node):
             else:
                 namespace = None
                 tag = ensure_str(node.tag)
-            attrs = {}
+            attrs = OrderedDict()
             for name, value in list(node.attrib.items()):
                 name = ensure_str(name)
                 value = ensure_str(value)