From 3d6bb3a29676f880e84014d98afcb5ac74a9844e Mon Sep 17 00:00:00 2001 From: Pradyun Gedam Date: Sat, 20 Jul 2019 12:38:05 +0530 Subject: [PATCH 1/2] Document our patch in _vendor/README.rst --- src/pip/_vendor/README.rst | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/pip/_vendor/README.rst b/src/pip/_vendor/README.rst index 8e9038ed7..539634204 100644 --- a/src/pip/_vendor/README.rst +++ b/src/pip/_vendor/README.rst @@ -99,7 +99,8 @@ Modifications * ``setuptools`` is completely stripped to only keep ``pkg_resources`` * ``pkg_resources`` has been modified to import its dependencies from ``pip._vendor`` * ``packaging`` has been modified to import its dependencies from ``pip._vendor`` -* ``html5lib`` has been modified to ``import six from pip._vendor`` +* ``html5lib`` has been modified to import six from ``pip._vendor`` and + to prefer importing from ``collections.abc`` instead of ``collections``. * ``CacheControl`` has been modified to import its dependencies from ``pip._vendor`` * ``requests`` has been modified to import its other dependencies from ``pip._vendor`` and to *not* load ``simplejson`` (all platforms) and ``pyopenssl`` (Windows). From 4ffa62d2e46b4c679e10268a2bf2431151a5a144 Mon Sep 17 00:00:00 2001 From: Pradyun Gedam Date: Sat, 20 Jul 2019 12:38:40 +0530 Subject: [PATCH 2/2] Change NEWS fragment section --- news/6728.bugfix | 1 - news/html5lib-collections-patch.vendor | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) delete mode 100644 news/6728.bugfix create mode 100644 news/html5lib-collections-patch.vendor diff --git a/news/6728.bugfix b/news/6728.bugfix deleted file mode 100644 index 792105ddb..000000000 --- a/news/6728.bugfix +++ /dev/null @@ -1 +0,0 @@ -Make vendored html5lib compatible with Python 3.9. diff --git a/news/html5lib-collections-patch.vendor b/news/html5lib-collections-patch.vendor new file mode 100644 index 000000000..de29b1f6b --- /dev/null +++ b/news/html5lib-collections-patch.vendor @@ -0,0 +1 @@ +Patch vendored html5lib, to prefer using `collections.abc` where possible.