diff options
author | V3n3RiX <venerix@koprulu.sector> | 2023-05-29 15:17:30 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2023-05-29 15:17:30 +0100 |
commit | 662f71ae67cd775d7fbb79b5091676c0e07a992b (patch) | |
tree | 74c7cb80b79b8886cd7466cf262878d1e8b9d546 /dev-python/werkzeug | |
parent | b2d3769042cfd3d8ceadaa52f6a5aafabb0d4114 (diff) |
gentoo auto-resync : 29:05:2023 - 15:17:30
Diffstat (limited to 'dev-python/werkzeug')
-rw-r--r-- | dev-python/werkzeug/Manifest | 3 | ||||
-rw-r--r-- | dev-python/werkzeug/files/werkzeug-2.3.4-iri-bytes.patch | 64 | ||||
-rw-r--r-- | dev-python/werkzeug/werkzeug-2.3.4-r1.ebuild (renamed from dev-python/werkzeug/werkzeug-2.3.4.ebuild) | 5 |
3 files changed, 71 insertions, 1 deletions
diff --git a/dev-python/werkzeug/Manifest b/dev-python/werkzeug/Manifest index fbaebd59334d..e03f7de53e81 100644 --- a/dev-python/werkzeug/Manifest +++ b/dev-python/werkzeug/Manifest @@ -1,3 +1,4 @@ +AUX werkzeug-2.3.4-iri-bytes.patch 2038 BLAKE2B 55fa8b29b1964017c1022bece78c692a18e062aec5e541f722d5604092662d79ccd9305bcb362d9a557a49d2e39cf417a2018341dffee8232a3b4a14acdfefc9 SHA512 e38e79d21b8e40de29bef81a626ec87aaeed57d511aefdead17744dd1b6dd88d3e2e55792577b2080c6fbc6fdbbd9094f53c0110d7256bbb9402f32d6f969754 DIST werkzeug-2.2.3.gh.tar.gz 847768 BLAKE2B 7d0b891a2b15e4fc469c3d331cfb2565f452ae77f772f7ab8e6254aedd172f9115cd3ebd9c82e951ea7505c0e58d6b6f07fb643a8e87af505e04686cccf56cd4 SHA512 3968e663f67e41da5148a4aa1d8e047ffd88416fa8df665e359bbe87992e4e723e1c915eed59ae86b53dd18817e41cdcef059483bce7aa8ed7b388dd4add1482 DIST werkzeug-2.3.0.gh.tar.gz 831666 BLAKE2B 2d4c792deab6e153794695e249ca97f24b5d70c7f912f7a6fd34b653a7e6e9e0fadb6178c3f388986d0c0dfc55fdbad9809894b70b38f32b3a6c7aaf4d1b4c3f SHA512 ec2bce1ae4311e99d931b96bb05fe98714e317e1d838edec1fd79a05e260ac544f680656b8d5957d123a59a94b40393eb12c3ca8d83e800cc46041b0c0968aea DIST werkzeug-2.3.1.gh.tar.gz 832058 BLAKE2B d92836c168339e4dfb07c27d8379548a6805e9aec884cb41b76b9b4196f982ec6d05a6e505bb2ad70e591e54a4a2cecd683b5b6b78a058f90adab704da154d1f SHA512 02b5feb1e4d5c7b24d7b890c579cd3211eb430101d14800ca6c1e2a244da90fee4d5c0cd4819ead58a2885df0c736c796720fd9a3378a1eabaf417aefaa5a919 @@ -9,5 +10,5 @@ EBUILD werkzeug-2.3.0.ebuild 1671 BLAKE2B 77827a88928308662977df1e4a7a6af6e38b74 EBUILD werkzeug-2.3.1.ebuild 1671 BLAKE2B 77827a88928308662977df1e4a7a6af6e38b746a354b2172df832f350fd1fe688f9cf0c49e7b36cb8548611785be1e767ac0633287a1194288a0a4e15b7d6326 SHA512 a0f2741376ce584c282e4d3559e37b2822c26520086c2b5d2a83d5c4e33932281e3dc7fa092bda72f8e36997559de821541141a80c5690acc6fb84823f65e847 EBUILD werkzeug-2.3.2.ebuild 1671 BLAKE2B 77827a88928308662977df1e4a7a6af6e38b746a354b2172df832f350fd1fe688f9cf0c49e7b36cb8548611785be1e767ac0633287a1194288a0a4e15b7d6326 SHA512 a0f2741376ce584c282e4d3559e37b2822c26520086c2b5d2a83d5c4e33932281e3dc7fa092bda72f8e36997559de821541141a80c5690acc6fb84823f65e847 EBUILD werkzeug-2.3.3.ebuild 1672 BLAKE2B 943a72bcad31dc64a83b17f9da97466825657d64c1b4f16aedcc39712b1f73608b6bde9b8f5e69351e7097e172b5df8a8c495a367515911ccdb02208eee79462 SHA512 8f08d4aca05e98cb469ad93029f645b46167388b6a22bf7ff5a4833c0bd4397a433f56e58868a23bf061ab765071dc6b606307c4f8d8c1a3541eac25f2b9330b -EBUILD werkzeug-2.3.4.ebuild 1672 BLAKE2B e216b9a96dbd05a4e3301d9b9afce32c651aefa9de98e89948d61135e2c8f6b29a8032d137423e9e02487003c5b9fd7ba79c4b06b3efcc0fc2709876836458b4 SHA512 2ccb330177bcf9e8b187361d020ce52bd79adacfb61ad49676e766b8240b307096b85cca068370e87bd5a16a2a8bdd4091c606d8b05476b442b8d27fed490044 +EBUILD werkzeug-2.3.4-r1.ebuild 1770 BLAKE2B d6821f2b95ad30850cee9d0262514107b9a846b283267bbe1ee4c2f1a60da9d29eda7ddd30a1690a386fa804942f5549ce2c37f930db8848a9db26c015a4e0ac SHA512 e15471c2b4c36bfbb9cdecc12579ad2c62361e3c96e354e3d0d94de590a4756b22f50bd24e45e3453a81bf08e69285394468ce481dbf8b999bc8e54ef551fcfe MISC metadata.xml 368 BLAKE2B 81932229098620395623f9149ac974f19fae9b65ad09943ee5c5d8d03c1e37e76061291c959fe5f004f531a244b3bb335c2a43dd66949c0be43493e45674d0e3 SHA512 67e5b5fea8052c0723820125271ea031ad984e0fe2af21d2423fc559bdc51dfe1d40f2fa5fe11e6d2b8b32216e716900080b859aad146c079ad2b390dd9844cf diff --git a/dev-python/werkzeug/files/werkzeug-2.3.4-iri-bytes.patch b/dev-python/werkzeug/files/werkzeug-2.3.4-iri-bytes.patch new file mode 100644 index 000000000000..1e06b0621cdd --- /dev/null +++ b/dev-python/werkzeug/files/werkzeug-2.3.4-iri-bytes.patch @@ -0,0 +1,64 @@ +From 3ba0fd5c52c9943c492ce098693bf9e651942fe5 Mon Sep 17 00:00:00 2001 +From: midchildan <git@midchildan.org> +Date: Sat, 27 May 2023 01:03:02 +0900 +Subject: [PATCH] fix: iri_to_uri fails when the argument is a bytestring + +This was caused by the 'charset' variable being used before it was ready. +--- + CHANGES.rst | 4 ++++ + src/werkzeug/urls.py | 20 ++++++++++---------- + tests/test_urls.py | 3 +++ + 3 files changed, 17 insertions(+), 10 deletions(-) + +diff --git a/src/werkzeug/urls.py b/src/werkzeug/urls.py +index 89ef21943..f5760eb4c 100644 +--- a/src/werkzeug/urls.py ++++ b/src/werkzeug/urls.py +@@ -966,6 +966,16 @@ def iri_to_uri( + + .. versionadded:: 0.6 + """ ++ if charset is not None: ++ warnings.warn( ++ "The 'charset' parameter is deprecated and will be removed" ++ " in Werkzeug 3.0.", ++ DeprecationWarning, ++ stacklevel=2, ++ ) ++ else: ++ charset = "utf-8" ++ + if isinstance(iri, tuple): + warnings.warn( + "Passing a tuple is deprecated and will not be supported in Werkzeug 3.0.", +@@ -982,16 +992,6 @@ def iri_to_uri( + ) + iri = iri.decode(charset) + +- if charset is not None: +- warnings.warn( +- "The 'charset' parameter is deprecated and will be removed" +- " in Werkzeug 3.0.", +- DeprecationWarning, +- stacklevel=2, +- ) +- else: +- charset = "utf-8" +- + if errors is not None: + warnings.warn( + "The 'errors' parameter is deprecated and will be removed in Werkzeug 3.0.", +diff --git a/tests/test_urls.py b/tests/test_urls.py +index 56bca8e94..765d42546 100644 +--- a/tests/test_urls.py ++++ b/tests/test_urls.py +@@ -231,6 +231,9 @@ def test_iri_support(): + + assert urls.iri_to_uri("/foo") == "/foo" + ++ with pytest.deprecated_call(): ++ assert urls.iri_to_uri(b"/foo") == "/foo" ++ + assert ( + urls.iri_to_uri("http://föö.com:8080/bam/baz") + == "http://xn--f-1gaa.com:8080/bam/baz" diff --git a/dev-python/werkzeug/werkzeug-2.3.4.ebuild b/dev-python/werkzeug/werkzeug-2.3.4-r1.ebuild index 83abfac7697c..45e61e3a2b87 100644 --- a/dev-python/werkzeug/werkzeug-2.3.4.ebuild +++ b/dev-python/werkzeug/werkzeug-2.3.4-r1.ebuild @@ -48,6 +48,11 @@ BDEPEND=" distutils_enable_tests pytest +PATCHES=( + # https://github.com/pallets/werkzeug/pull/2709 + "${FILESDIR}/${P}-iri-bytes.patch" +) + python_test() { local EPYTEST_DESELECT=() if ! has_version "dev-python/cryptography[${PYTHON_USEDEP}]"; then |