diff --git a/python-bleach.changes b/python-bleach.changes index 83ce0e4..b486c0e 100644 --- a/python-bleach.changes +++ b/python-bleach.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Jun 29 11:31:20 UTC 2023 - Markéta Machová + +- Add patch strip-spaces.patch (bsc#1212852) + * sent upstream: https://github.com/mozilla/bleach/pull/706 + ------------------------------------------------------------------- Mon May 8 11:57:24 UTC 2023 - Daniel Garcia diff --git a/python-bleach.spec b/python-bleach.spec index 1b914f4..632386d 100644 --- a/python-bleach.spec +++ b/python-bleach.spec @@ -26,6 +26,8 @@ License: Apache-2.0 URL: https://github.com/jsocol/bleach Source: https://files.pythonhosted.org/packages/source/b/bleach/bleach-%{version}.tar.gz Patch0: de-vendor.patch +# https://github.com/mozilla/bleach/pull/706 +Patch1: strip-spaces.patch BuildRequires: %{python_module html5lib >= 1.1} BuildRequires: %{python_module pytest} BuildRequires: %{python_module setuptools} @@ -62,8 +64,7 @@ rm -rf bleach/_vendor %check # gh#mozilla/bleach#503 -# https://github.com/mozilla/bleach/issues/543 -%pytest -k 'not (test_uri_value_allowed_protocols or test_bleach_html_parser or test_css_parsing_gauntlet_regex_backtracking)' +%pytest -k 'not test_uri_value_allowed_protocols' %files %{python_files} %license LICENSE diff --git a/strip-spaces.patch b/strip-spaces.patch new file mode 100644 index 0000000..3c9ec06 --- /dev/null +++ b/strip-spaces.patch @@ -0,0 +1,22 @@ +Index: bleach-6.0.0/tests/test_parse_shim.py +=================================================================== +--- bleach-6.0.0.orig/tests/test_parse_shim.py ++++ bleach-6.0.0/tests/test_parse_shim.py +@@ -48,14 +48,12 @@ class ParseResult: + ParseResult(scheme="non-special", netloc=":@test", path="/x"), + ), + ("http:foo.com", ParseResult(scheme="http", path="foo.com")), +- # NOTE(willkg): The wpt tests set the scheme to http becaue that's what ++ # NOTE(willkg): The wpt tests set the scheme to http because that's what + # the base url is. Since our parser is not using a baseurl, it sets the +- # scheme to "". Further, our parser includes spaces at the beginning, +- # but I don't see that as being problematic. +- ("\t :foo.com \n", ParseResult(path=" :foo.com ")), ++ # scheme to "". + # NOTE(willkg): The wpt tests set the path to "/foo/foo.com" because + # the base url is at "/foo" +- (" foo.com ", ParseResult(path=" foo.com ")), ++ ("foo.com ", ParseResult(path="foo.com ")), + ("a:\t foo.com", ParseResult(scheme="a", path=" foo.com")), + ( + "http://f:21/ b ? d # e ",