Upgrade Python syntax for Python 3.7+

hugovk · hugovk · commit 67b42b705cdb · 2022-07-06T11:00:09.000+03:00
diff --git a/html5lib/_tokenizer.py b/html5lib/_tokenizer.py
@@ -1,5 +1,4 @@
-from collections import deque, OrderedDict
-from sys import version_info
+from collections import deque
 
 from .constants import spaceCharacters
 from .constants import entities
@@ -14,11 +13,6 @@
 
 entitiesTrie = Trie(entities)
 
-if version_info >= (3, 7):
-    attributeMap = dict
-else:
-    attributeMap = OrderedDict
-
 
 class HTMLTokenizer:
     """ This class takes care of tokenizing HTML.
@@ -232,7 +226,7 @@ def emitCurrentToken(self):
             token["name"] = token["name"].translate(asciiUpper2Lower)
             if token["type"] == tokenTypes["StartTag"]:
                 raw = token["data"]
-                data = attributeMap(raw)
+                data = dict(raw)
                 if len(raw) > len(data):
                     # we had some duplicated attribute, fix so first wins
                     data.update(raw[::-1])
diff --git a/html5lib/tests/test_treewalkers.py b/html5lib/tests/test_treewalkers.py
@@ -1,5 +1,4 @@
 import itertools
-import sys
 
 import pytest
 
@@ -139,8 +138,8 @@ def test_lxml_xml():
 @pytest.mark.parametrize("treeName",
                          [pytest.param(treeName, marks=[getattr(pytest.mark, treeName),
                                                         pytest.mark.skipif(
-                                                            treeName != "lxml" or
-                                                            sys.version_info < (3, 7), reason="dict order undef")])
+                                                            treeName != "lxml",
+                                                            reason="dict order undef")])
                           for treeName in sorted(treeTypes.keys())])
 def test_maintain_attribute_order(treeName):
     treeAPIs = treeTypes[treeName]
@@ -172,8 +171,8 @@ def test_maintain_attribute_order(treeName):
 @pytest.mark.parametrize("treeName",
                          [pytest.param(treeName, marks=[getattr(pytest.mark, treeName),
                                                         pytest.mark.skipif(
-                                                            treeName != "lxml" or
-                                                            sys.version_info < (3, 7), reason="dict order undef")])
+                                                            treeName != "lxml",
+                                                            reason="dict order undef")])
                           for treeName in sorted(treeTypes.keys())])
 def test_maintain_attribute_order_adjusted(treeName):
     treeAPIs = treeTypes[treeName]
