From fd9bd9dba21fd16cc8073288532d4c183c64ffb4 Mon Sep 17 00:00:00 2001 From: Gyorgy Sarvari Date: Sun, 19 Oct 2025 15:10:46 +0200 Subject: python3-yarl: fix ptests (and make it compatible with current python) oe-core currently ships with Python 3.10.18. Python 3.10.17 has introduced a change in urlparse library, regarding how brackets are handled by urllib.parse.urlsplit() and urlparse() functions (which makes it more conformant to the specification). This has caused a regression in yarl: some tests have failed, and it also revealed a bug in how yarl treates brackets. This backported patch corrects this behavior, making it compatible once again with the current Python version - and it also allows the the ptests to pass once again. Signed-off-by: Gyorgy Sarvari --- ...square-bracket-handling-in-URL-netloc-882.patch | 138 +++++++++++++++++++++ .../recipes-devtools/python/python3-yarl_1.7.2.bb | 3 +- 2 files changed, 140 insertions(+), 1 deletion(-) create mode 100644 meta-python/recipes-devtools/python/python3-yarl/0001-Correct-square-bracket-handling-in-URL-netloc-882.patch (limited to 'meta-python/recipes-devtools') diff --git a/meta-python/recipes-devtools/python/python3-yarl/0001-Correct-square-bracket-handling-in-URL-netloc-882.patch b/meta-python/recipes-devtools/python/python3-yarl/0001-Correct-square-bracket-handling-in-URL-netloc-882.patch new file mode 100644 index 0000000000..293ce88a13 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-yarl/0001-Correct-square-bracket-handling-in-URL-netloc-882.patch @@ -0,0 +1,138 @@ +From 0a94c6e4948e00fff072c0cf367afbf4ac36f906 Mon Sep 17 00:00:00 2001 +From: Martijn Pieters +Date: Wed, 14 Jun 2023 11:17:16 +0100 +Subject: [PATCH] Correct square bracket handling in URL netloc (#882) + +- The human representation of usernames and passwords should percent- + encode square brackets. +- Clean up the test suite to remove tests that use invalid hostnames + (square brackets in a host name must only be used for IPv6 addresses). +- Rename the remaining test using IPvFuture address syntax to make this + explicit. +- Drop a test for IPv6 addresses with a zone id; zone id support is + controversial and expilictly excluded from the WHATWG URL standard. + Zone ids *without percent characters in their name* continue to work + as long as urllib.parse.urlsplit() accepts them but this is not + something that yarl.URL() needs to support explicitly. + +Upstream-Status: Backport [https://github.com/aio-libs/yarl/commit/0a94c6e4948e00fff072c0cf367afbf4ac36f906] +Signed-off-by: Gyorgy Sarvari + +--- + CHANGES/876.bugfix.rst | 1 + + tests/test_url.py | 10 ++-------- + tests/test_url_parsing.py | 28 ++-------------------------- + yarl/_url.py | 4 ++-- + 4 files changed, 7 insertions(+), 36 deletions(-) + create mode 100644 CHANGES/876.bugfix.rst + +diff --git a/CHANGES/876.bugfix.rst b/CHANGES/876.bugfix.rst +new file mode 100644 +index 0000000..ef62c7e +--- /dev/null ++++ b/CHANGES/876.bugfix.rst +@@ -0,0 +1 @@ ++Fixed the human representation of URLs with square brackets in usernames and passwords. +diff --git a/tests/test_url.py b/tests/test_url.py +index 1981b20..295c063 100644 +--- a/tests/test_url.py ++++ b/tests/test_url.py +@@ -236,12 +236,6 @@ def test_compressed_ipv6(): + assert url.host == url.raw_host + + +-def test_ipv6_zone(): +- url = URL("http://[fe80::822a:a8ff:fe49:470c%тест%42]:123") +- assert url.raw_host == "fe80::822a:a8ff:fe49:470c%тест%42" +- assert url.host == url.raw_host +- +- + def test_ipv4_zone(): + # I'm unsure if it is correct. + url = URL("http://1.2.3.4%тест%42:123") +@@ -1660,8 +1654,8 @@ def test_human_repr_delimiters(): + s = url.human_repr() + assert URL(s) == url + assert ( +- s == "http:// !\"%23$%25&'()*+,-.%2F%3A;<=>%3F%40[\\]^_`{|}~" +- ": !\"%23$%25&'()*+,-.%2F%3A;<=>%3F%40[\\]^_`{|}~" ++ s == "http:// !\"%23$%25&'()*+,-.%2F%3A;<=>%3F%40%5B\\%5D^_`{|}~" ++ ": !\"%23$%25&'()*+,-.%2F%3A;<=>%3F%40%5B\\%5D^_`{|}~" + "@хост.домен:8080" + "/ !\"%23$%25&'()*+,-./:;<=>%3F@[\\]^_`{|}~" + "? !\"%23$%25%26'()*%2B,-./:%3B<%3D>?@[\\]^_`{|}~" +diff --git a/tests/test_url_parsing.py b/tests/test_url_parsing.py +index 0f0dd7e..60f128c 100644 +--- a/tests/test_url_parsing.py ++++ b/tests/test_url_parsing.py +@@ -178,14 +178,6 @@ class TestHost: + assert u.query_string == "" + assert u.fragment == "" + +- def test_masked_ipv4(self): +- u = URL("//[127.0.0.1]/") +- assert u.scheme == "" +- assert u.host == "127.0.0.1" +- assert u.path == "/" +- assert u.query_string == "" +- assert u.fragment == "" +- + def test_ipv6(self): + u = URL("//[::1]/") + assert u.scheme == "" +@@ -194,15 +186,7 @@ class TestHost: + assert u.query_string == "" + assert u.fragment == "" + +- def test_strange_ip(self): +- u = URL("//[-1]/") +- assert u.scheme == "" +- assert u.host == "-1" +- assert u.path == "/" +- assert u.query_string == "" +- assert u.fragment == "" +- +- def test_strange_ip_2(self): ++ def test_ipvfuture_address(self): + u = URL("//[v1.-1]/") + assert u.scheme == "" + assert u.host == "v1.-1" +@@ -210,14 +194,6 @@ class TestHost: + assert u.query_string == "" + assert u.fragment == "" + +- def test_strange_ip_3(self): +- u = URL("//v1.[::1]/") +- assert u.scheme == "" +- assert u.host == "::1" +- assert u.path == "/" +- assert u.query_string == "" +- assert u.fragment == "" +- + + class TestPort: + def test_canonical(self): +@@ -320,7 +296,7 @@ class TestUserInfo: + assert u.fragment == "" + + def test_weird_user3(self): +- u = URL("//[some]@host") ++ u = URL("//%5Bsome%5D@host") + assert u.scheme == "" + assert u.user == "[some]" + assert u.password is None +diff --git a/yarl/_url.py b/yarl/_url.py +index 74190d9..c8f2acb 100644 +--- a/yarl/_url.py ++++ b/yarl/_url.py +@@ -1118,8 +1118,8 @@ class URL: + + def human_repr(self): + """Return decoded human readable string for URL representation.""" +- user = _human_quote(self.user, "#/:?@") +- password = _human_quote(self.password, "#/:?@") ++ user = _human_quote(self.user, "#/:?@[]") ++ password = _human_quote(self.password, "#/:?@[]") + host = self.host + if host: + host = self._encode_host(self.host, human=True) diff --git a/meta-python/recipes-devtools/python/python3-yarl_1.7.2.bb b/meta-python/recipes-devtools/python/python3-yarl_1.7.2.bb index 0867d1cb53..902cace048 100644 --- a/meta-python/recipes-devtools/python/python3-yarl_1.7.2.bb +++ b/meta-python/recipes-devtools/python/python3-yarl_1.7.2.bb @@ -5,7 +5,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=e581798a7b985311f29fa3e163ea27ae" SRC_URI[sha256sum] = "45399b46d60c253327a460e99856752009fcee5f5d3c80b2f7c0cae1c38d56dd" -SRC_URI += "file://run-ptest" +SRC_URI += "file://run-ptest \ + file://0001-Correct-square-bracket-handling-in-URL-netloc-882.patch" PYPI_PACKAGE = "yarl" -- cgit v1.2.3-54-g00ecf