From fc33b9e4ce81dc99d8a2bc35b88aa08aec42b6a0 Mon Sep 17 00:00:00 2001 From: robot-contrib Date: Sat, 17 Feb 2024 09:08:38 +0300 Subject: Update contrib/python/MarkupSafe/py3 to 2.1.5 c95a7bd6addacfa0dd622f5719405eccc20c4f9d --- contrib/python/MarkupSafe/py3/.dist-info/METADATA | 2 +- contrib/python/MarkupSafe/py3/markupsafe/__init__.py | 7 ++++--- contrib/python/MarkupSafe/py3/tests/test_markupsafe.py | 2 +- contrib/python/MarkupSafe/py3/ya.make | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-) (limited to 'contrib/python') diff --git a/contrib/python/MarkupSafe/py3/.dist-info/METADATA b/contrib/python/MarkupSafe/py3/.dist-info/METADATA index c221b8e50e5..dfe37d52dfb 100644 --- a/contrib/python/MarkupSafe/py3/.dist-info/METADATA +++ b/contrib/python/MarkupSafe/py3/.dist-info/METADATA @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: MarkupSafe -Version: 2.1.4 +Version: 2.1.5 Summary: Safely add untrusted strings to HTML/XML markup. Home-page: https://palletsprojects.com/p/markupsafe/ Maintainer: Pallets diff --git a/contrib/python/MarkupSafe/py3/markupsafe/__init__.py b/contrib/python/MarkupSafe/py3/markupsafe/__init__.py index 2f401a81539..b40f24c66de 100644 --- a/contrib/python/MarkupSafe/py3/markupsafe/__init__.py +++ b/contrib/python/MarkupSafe/py3/markupsafe/__init__.py @@ -13,7 +13,7 @@ if t.TYPE_CHECKING: _P = te.ParamSpec("_P") -__version__ = "2.1.4" +__version__ = "2.1.5" def _simple_escaping_wrapper(func: "t.Callable[_P, str]") -> "t.Callable[_P, Markup]": @@ -158,8 +158,7 @@ class Markup(str): >>> Markup("Main »\tAbout").striptags() 'Main ยป About' """ - # collapse spaces - value = " ".join(self.split()) + value = str(self) # Look for comments then tags separately. Otherwise, a comment that # contains a tag would end early, leaving some of the comment behind. @@ -193,6 +192,8 @@ class Markup(str): value = f"{value[:start]}{value[end + 1:]}" + # collapse spaces + value = " ".join(value.split()) return self.__class__(value).unescape() @classmethod diff --git a/contrib/python/MarkupSafe/py3/tests/test_markupsafe.py b/contrib/python/MarkupSafe/py3/tests/test_markupsafe.py index ea9a91873c8..94bea387954 100644 --- a/contrib/python/MarkupSafe/py3/tests/test_markupsafe.py +++ b/contrib/python/MarkupSafe/py3/tests/test_markupsafe.py @@ -73,7 +73,7 @@ def test_escaping(escape): Markup( "" "Foo & Bar" - "" + " \n " "" "" "" diff --git a/contrib/python/MarkupSafe/py3/ya.make b/contrib/python/MarkupSafe/py3/ya.make index 3583a8035e2..f1664c93e8f 100644 --- a/contrib/python/MarkupSafe/py3/ya.make +++ b/contrib/python/MarkupSafe/py3/ya.make @@ -2,7 +2,7 @@ PY3_LIBRARY() -VERSION(2.1.4) +VERSION(2.1.5) LICENSE(BSD-3-Clause) -- cgit v1.3