fixup! fixup! Preserve attribute order when parsing

Author: gsnedders

html5lib/html5parser.py

@@ -1,5 +1,5 @@
 from __future__ import absolute_import, division, unicode_literals
-from six import with_metaclass, viewkeys
+from six import with_metaclass, viewkeys, PY3
 
 import types
 
@@ -2631,7 +2631,11 @@ def processEndTag(self, token):
 
 
 def adjust_attributes(token, replacements):
-    if viewkeys(token['data']) & viewkeys(replacements):
+    if PY3 or utils.PY27:
+        needs_adjustment = viewkeys(token['data']) & viewkeys(replacements)
+    else:
+        needs_adjustment = frozenset(token['data']) & frozenset(replacements)
+    if needs_adjustment:
         token['data'] = OrderedDict((replacements.get(k, k), v)
                                     for k, v in token['data'].items())
 

html5lib/utils.py

@@ -1,5 +1,6 @@
 from __future__ import absolute_import, division, unicode_literals
 
+import sys
 from types import ModuleType
 
 from six import text_type
@@ -12,9 +13,11 @@
 
 __all__ = ["default_etree", "MethodDispatcher", "isSurrogatePair",
            "surrogatePairToCodepoint", "moduleFactoryFactory",
-           "supports_lone_surrogates"]
+           "supports_lone_surrogates", "PY27"]
 
 
+PY27 = sys.version_info[0] == 2 and sys.version_info[1] >= 7
+
 # Platforms not supporting lone surrogates (\uD800-\uDFFF) should be
 # caught by the below test. In general this would be any platform
 # using UTF-16 as its encoding of unicode strings, such as