-
Notifications
You must be signed in to change notification settings - Fork 3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add an html5lib patch for Python 3.9 compatibility
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
Showing
4 changed files
with
40 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
Make vendored html5lib compatible with Python 3.9. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 | ||
|