summaryrefslogtreecommitdiff
diff options
authorGraham Inggs <ginggs@ubuntu.com>2026-04-06 15:01:20 +0000
committergit-ubuntu importer <ubuntu-devel-discuss@lists.ubuntu.com>2026-04-06 15:10:42 +0000
commit8b20d26dcfffe7b239699a5e41f3fcd73add8d99 (patch)
tree0259dd366d291430dab699db63bff665c744b566
parentcef7728780e30b8f2dd7369025c815739cc71549 (diff)
Imported using git-ubuntu import.
Notes
Notes: * Cherry-pick upstream commit for compatibility with idna 3.11 * Skip test_parse_set_cookie_headers_uses_unquote_with_octal, control characters are now rejected by Python, see gh-145599
-rw-r--r--debian/changelog8
-rw-r--r--debian/control3
-rw-r--r--debian/patches/idna3.11.patch16
-rw-r--r--debian/patches/series1
-rwxr-xr-xdebian/rules1
5 files changed, 28 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 2074e8c..5ad86e1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+python-aiohttp (3.13.3-3ubuntu1) resolute; urgency=medium
+
+ * Cherry-pick upstream commit for compatibility with idna 3.11
+ * Skip test_parse_set_cookie_headers_uses_unquote_with_octal,
+ control characters are now rejected by Python, see gh-145599
+
+ -- Graham Inggs <ginggs@ubuntu.com> Mon, 06 Apr 2026 15:01:20 +0000
+
python-aiohttp (3.13.3-3build1) resolute; urgency=medium
* No-change rebuild to drop Python 3.13 bits.
diff --git a/debian/control b/debian/control
index f1ef1b5..9e358a2 100644
--- a/debian/control
+++ b/debian/control
@@ -1,6 +1,7 @@
Source: python-aiohttp
Section: python
-Maintainer: Debian Python Team <team+python@tracker.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian Python Team <team+python@tracker.debian.org>
Uploaders: Tianon Gravi <admwiggin@gmail.com>,
Paul Tagliamonte <paultag@debian.org>,
Piotr Ożarowski <piotr@debian.org>,
diff --git a/debian/patches/idna3.11.patch b/debian/patches/idna3.11.patch
new file mode 100644
index 0000000..7e19f08
--- /dev/null
+++ b/debian/patches/idna3.11.patch
@@ -0,0 +1,16 @@
+Description: Fix test_invalid_idna for idna 3.11 compatibility
+Origin: upstream, https://github.com/aio-libs/aiohttp/commit/9053e8ce4a72cfc38eba9f224d4d432371c0c25b
+Author: Rodrigo Nogueira <rodrigo.b.nogueira@gmail.com>
+Last-Update: 2026-02-15
+
+--- a/tests/test_client_functional.py
++++ b/tests/test_client_functional.py
+@@ -3319,7 +3319,7 @@
+ session = aiohttp.ClientSession()
+ try:
+ with pytest.raises(aiohttp.InvalidURL):
+- await session.get("http://\u2061owhefopw.com")
++ await session.get("http://\u0080owhefopw.com")
+ finally:
+ await session.close()
+
diff --git a/debian/patches/series b/debian/patches/series
index d02f8aa..794bd95 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@
0004-remove-sphinxcontrib.towncrier-for-now.patch
0005-avoid-aiohttp-theme.patch
0006-Use-local-Sphinx-inventories-where-available.patch
+idna3.11.patch
diff --git a/debian/rules b/debian/rules
index dba7d64..9df32f1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,6 +22,7 @@ export PYBUILD_TEST_ARGS=--no-cov \
not test_ctor and \
not test_base_ctor and \
not test_cookie_pattern_performance and \
+ not test_parse_set_cookie_headers_uses_unquote_with_octal and \
not test_regex_performance and \
not test_feed_eof_no_err_brotli and \
not test_http_response_parser_strict_obs_line_folding and \