From bbcc9aa3e05f91699331fc8ea89136b88029f807 Mon Sep 17 00:00:00 2001 From: "Jules Lasne (jlasne)" Date: Mon, 17 Dec 2018 19:29:36 +0100 Subject: [PATCH 1/4] Removed dangling `since Python` at the end of library/xml.rst --- Doc/library/xml.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Doc/library/xml.rst b/Doc/library/xml.rst index 9b8ba6b17c8531..4f6cd95ffe2260 100644 --- a/Doc/library/xml.rst +++ b/Doc/library/xml.rst @@ -76,7 +76,7 @@ decompression bomb Safe Safe Safe S the unexpanded entity verbatim. 3. :mod:`xmlrpclib` doesn't expand external entities and omits them. 4. Since Python 3.8.0, external general entities are no longer processed by - default since Python. + default. billion laughs / exponential entity expansion From fb0188aebc1ffca3ef74a75c511927df5653d9d5 Mon Sep 17 00:00:00 2001 From: "Jules Lasne (jlasne)" Date: Tue, 18 Dec 2018 11:04:57 +0100 Subject: [PATCH 2/4] Added versionchanged entry --- Doc/library/xml.rst | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Doc/library/xml.rst b/Doc/library/xml.rst index 4f6cd95ffe2260..f42e761f039434 100644 --- a/Doc/library/xml.rst +++ b/Doc/library/xml.rst @@ -75,8 +75,10 @@ decompression bomb Safe Safe Safe S 2. :mod:`xml.dom.minidom` doesn't expand external entities and simply returns the unexpanded entity verbatim. 3. :mod:`xmlrpclib` doesn't expand external entities and omits them. -4. Since Python 3.8.0, external general entities are no longer processed by - default. + +.. versionchanged:: 3.8 + External general entities are no longer processed by + default. billion laughs / exponential entity expansion From 10c2c9c1778d31750137ddced44df0f6c1b13894 Mon Sep 17 00:00:00 2001 From: "Jules Lasne (jlasne)" Date: Tue, 18 Dec 2018 12:55:39 +0100 Subject: [PATCH 3/4] Revert change of versionchanged --- Doc/library/xml.rst | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Doc/library/xml.rst b/Doc/library/xml.rst index f42e761f039434..763e75a1de7b9a 100644 --- a/Doc/library/xml.rst +++ b/Doc/library/xml.rst @@ -75,9 +75,7 @@ decompression bomb Safe Safe Safe S 2. :mod:`xml.dom.minidom` doesn't expand external entities and simply returns the unexpanded entity verbatim. 3. :mod:`xmlrpclib` doesn't expand external entities and omits them. - -.. versionchanged:: 3.8 - External general entities are no longer processed by +4. Since Python 3.8, external general entities are no longer processed by default. From 015ccec106ab060ea68f80e558b312d18923e0cf Mon Sep 17 00:00:00 2001 From: "Jules Lasne (jlasne)" Date: Tue, 18 Dec 2018 13:16:45 +0100 Subject: [PATCH 4/4] Remove trailing whitespace found with travis --- Doc/library/xml.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Doc/library/xml.rst b/Doc/library/xml.rst index 763e75a1de7b9a..be1272940b8e78 100644 --- a/Doc/library/xml.rst +++ b/Doc/library/xml.rst @@ -75,8 +75,8 @@ decompression bomb Safe Safe Safe S 2. :mod:`xml.dom.minidom` doesn't expand external entities and simply returns the unexpanded entity verbatim. 3. :mod:`xmlrpclib` doesn't expand external entities and omits them. -4. Since Python 3.8, external general entities are no longer processed by - default. +4. Since Python 3.8, external general entities are no longer processed by + default. billion laughs / exponential entity expansion