Skip to content

Commit

Permalink
Add an html5lib patch for Python 3.9 compatibility
Browse files Browse the repository at this point in the history
The patch is adapted from html5lib/html5lib-python@4f92357

Closes #6407
Closes #6237
  • Loading branch information
Chih-Hsuan Yen committed Jul 18, 2019
1 parent a53e571 commit ef7ca14
Show file tree
Hide file tree
Showing 4 changed files with 40 additions and 2 deletions.
1 change: 1 addition & 0 deletions news/6728.bugfix
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Make vendored html5lib compatible with Python 3.9.
5 changes: 4 additions & 1 deletion src/pip/_vendor/html5lib/_trie/_base.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
from __future__ import absolute_import, division, unicode_literals

from collections import Mapping
try:
from collections.abc import Mapping
except ImportError: # Python 2.7
from collections import Mapping


class Trie(Mapping):
Expand Down
5 changes: 4 additions & 1 deletion src/pip/_vendor/html5lib/treebuilders/dom.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
from __future__ import absolute_import, division, unicode_literals


from collections import MutableMapping
try:
from collections.abc import MutableMapping
except ImportError: # Python 2.7
from collections import MutableMapping
from xml.dom import minidom, Node
import weakref

Expand Down
31 changes: 31 additions & 0 deletions tasks/vendoring/patches/html5lib.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
diff --git a/src/pip/_vendor/html5lib/_trie/_base.py b/src/pip/_vendor/html5lib/_trie/_base.py
index a1158bbb..6b71975f 100644
--- a/src/pip/_vendor/html5lib/_trie/_base.py
+++ b/src/pip/_vendor/html5lib/_trie/_base.py
@@ -1,6 +1,9 @@
from __future__ import absolute_import, division, unicode_literals

-from collections import Mapping
+try:
+ from collections.abc import Mapping
+except ImportError: # Python 2.7
+ from collections import Mapping


class Trie(Mapping):
diff --git a/src/pip/_vendor/html5lib/treebuilders/dom.py b/src/pip/_vendor/html5lib/treebuilders/dom.py
index dcfac220..d8b53004 100644
--- a/src/pip/_vendor/html5lib/treebuilders/dom.py
+++ b/src/pip/_vendor/html5lib/treebuilders/dom.py
@@ -1,7 +1,10 @@
from __future__ import absolute_import, division, unicode_literals


-from collections import MutableMapping
+try:
+ from collections.abc import MutableMapping
+except ImportError: # Python 2.7
+ from collections import MutableMapping
from xml.dom import minidom, Node
import weakref

0 comments on commit ef7ca14

Please sign in to comment.