diff --git a/html5lib/_trie/_base.py b/html5lib/_trie/_base.py index 6b71975f..a9295a2b 100644 --- a/html5lib/_trie/_base.py +++ b/html5lib/_trie/_base.py @@ -1,9 +1,6 @@ from __future__ import absolute_import, division, unicode_literals -try: - from collections.abc import Mapping -except ImportError: # Python 2.7 - from collections import Mapping +from collections.abc import Mapping class Trie(Mapping): diff --git a/html5lib/filters/alphabeticalattributes.py b/html5lib/filters/alphabeticalattributes.py index 5ba926e3..f7789eef 100644 --- a/html5lib/filters/alphabeticalattributes.py +++ b/html5lib/filters/alphabeticalattributes.py @@ -2,7 +2,7 @@ from . import base -from collections import OrderedDict +from collections.abc import OrderedDict def _attr_key(attr): diff --git a/html5lib/tests/test_alphabeticalattributes.py b/html5lib/tests/test_alphabeticalattributes.py index 7d5b8e0f..d50cd647 100644 --- a/html5lib/tests/test_alphabeticalattributes.py +++ b/html5lib/tests/test_alphabeticalattributes.py @@ -1,6 +1,6 @@ from __future__ import absolute_import, division, unicode_literals -from collections import OrderedDict +from collections.abc import OrderedDict import pytest diff --git a/html5lib/treebuilders/dom.py b/html5lib/treebuilders/dom.py index d8b53004..d0b8cd2b 100644 --- a/html5lib/treebuilders/dom.py +++ b/html5lib/treebuilders/dom.py @@ -1,10 +1,6 @@ from __future__ import absolute_import, division, unicode_literals - -try: - from collections.abc import MutableMapping -except ImportError: # Python 2.7 - from collections import MutableMapping +from collections.abc import MutableMapping from xml.dom import minidom, Node import weakref diff --git a/html5lib/treewalkers/etree.py b/html5lib/treewalkers/etree.py index d15a7eeb..476c400b 100644 --- a/html5lib/treewalkers/etree.py +++ b/html5lib/treewalkers/etree.py @@ -1,6 +1,6 @@ from __future__ import absolute_import, division, unicode_literals -from collections import OrderedDict +from collections.abc import OrderedDict import re from six import string_types