From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A5F2B13835A for ; Wed, 27 May 2020 15:22:21 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 99528E0908; Wed, 27 May 2020 15:22:20 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6D655E0908 for ; Wed, 27 May 2020 15:22:20 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BC19534EE47 for ; Wed, 27 May 2020 15:22:18 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 191DA268 for ; Wed, 27 May 2020 15:22:16 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1590592932.b8ac8ee8c30d7400592f56c9ae6c34c4b076fc02.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/twisted/, dev-python/twisted/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/twisted/files/twisted-19.10.0-py38-cgi.patch dev-python/twisted/twisted-19.10.0.ebuild X-VCS-Directories: dev-python/twisted/files/ dev-python/twisted/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: b8ac8ee8c30d7400592f56c9ae6c34c4b076fc02 X-VCS-Branch: master Date: Wed, 27 May 2020 15:22:16 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: f4704e2a-f3d0-4575-abf8-a3fbe3040bd1 X-Archives-Hash: 436657fd7a96f81d39270ad27b35ee07 commit: b8ac8ee8c30d7400592f56c9ae6c34c4b076fc02 Author: Michał Górny gentoo org> AuthorDate: Wed May 27 15:00:37 2020 +0000 Commit: Michał Górny gentoo 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 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 )