From: "Michał Górny" <mgorny@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/twisted/, dev-python/twisted/files/
Date: Wed, 27 May 2020 15:22:16 +0000 (UTC) [thread overview]
Message-ID: <1590592932.b8ac8ee8c30d7400592f56c9ae6c34c4b076fc02.mgorny@gentoo> (raw)
commit: b8ac8ee8c30d7400592f56c9ae6c34c4b076fc02
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed May 27 15:00:37 2020 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed May 27 15:22:12 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8ac8ee8
dev-python/twisted: Unbreak py2.7 in 19.10.0
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
.../twisted/files/twisted-19.10.0-py38-cgi.patch | 41 ++++++++++++++++++++++
dev-python/twisted/twisted-19.10.0.ebuild | 2 +-
2 files changed, 42 insertions(+), 1 deletion(-)
diff --git a/dev-python/twisted/files/twisted-19.10.0-py38-cgi.patch b/dev-python/twisted/files/twisted-19.10.0-py38-cgi.patch
new file mode 100644
index 00000000000..5fc4768e5d2
--- /dev/null
+++ b/dev-python/twisted/files/twisted-19.10.0-py38-cgi.patch
@@ -0,0 +1,41 @@
+diff --git a/src/twisted/web/test/test_http.py b/src/twisted/web/test/test_http.py
+index 6001d1e40..1cf9172ef 100644
+--- a/src/twisted/web/test/test_http.py
++++ b/src/twisted/web/test/test_http.py
+@@ -9,15 +9,15 @@ from __future__ import absolute_import, division
+
+ import base64
+ import calendar
+-import cgi
+ import random
+
+ import hamcrest
+
+ try:
+ from urlparse import urlparse, urlunsplit, clear_cache
++ from cgi import parse_qs
+ except ImportError:
+- from urllib.parse import urlparse, urlunsplit, clear_cache
++ from urllib.parse import urlparse, urlunsplit, clear_cache, parse_qs
+
+ from io import BytesIO
+ from itertools import cycle
+@@ -2156,15 +2156,15 @@ Hello,
+ class QueryArgumentsTests(unittest.TestCase):
+ def testParseqs(self):
+ self.assertEqual(
+- cgi.parse_qs(b"a=b&d=c;+=f"),
++ parse_qs(b"a=b&d=c;+=f"),
+ http.parse_qs(b"a=b&d=c;+=f"))
+ self.assertRaises(
+ ValueError, http.parse_qs, b"blah", strict_parsing=True)
+ self.assertEqual(
+- cgi.parse_qs(b"a=&b=c", keep_blank_values=1),
++ parse_qs(b"a=&b=c", keep_blank_values=1),
+ http.parse_qs(b"a=&b=c", keep_blank_values=1))
+ self.assertEqual(
+- cgi.parse_qs(b"a=&b=c"),
++ parse_qs(b"a=&b=c"),
+ http.parse_qs(b"a=&b=c"))
+
+
diff --git a/dev-python/twisted/twisted-19.10.0.ebuild b/dev-python/twisted/twisted-19.10.0.ebuild
index 6f7b8e4d9c7..6ed6b63c9d3 100644
--- a/dev-python/twisted/twisted-19.10.0.ebuild
+++ b/dev-python/twisted/twisted-19.10.0.ebuild
@@ -83,7 +83,7 @@ DEPEND="
python_prepare_all() {
local PATCHES=(
"${FILESDIR}"/${P}-py38.patch
- "${FILESDIR}"/twisted-20.3.0-py38-cgi.patch
+ "${FILESDIR}"/twisted-19.10.0-py38-cgi.patch
"${FILESDIR}"/twisted-20.3.0-py38-hmac.patch
)
next reply other threads:[~2020-05-27 15:22 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-27 15:22 Michał Górny [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-08-01 5:07 [gentoo-commits] repo/gentoo:master commit in: dev-python/twisted/, dev-python/twisted/files/ Petr Vaněk
2024-01-12 19:00 Michał Górny
2023-10-18 15:56 Michał Górny
2022-05-13 9:08 Michał Górny
2022-02-17 19:40 Michał Górny
2022-02-08 11:43 Michał Górny
2021-07-29 5:51 Michał Górny
2021-06-01 20:35 Michał Górny
2021-03-21 22:42 Michał Górny
2020-06-04 6:24 Michał Górny
2020-05-27 15:22 Michał Górny
2020-04-24 19:24 Michał Górny
2018-07-07 19:03 Brian Dolbec
2017-10-27 2:29 Brian Dolbec
2017-03-30 2:40 Brian Dolbec
2016-10-07 18:11 Brian Dolbec
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1590592932.b8ac8ee8c30d7400592f56c9ae6c34c4b076fc02.mgorny@gentoo \
--to=mgorny@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox