[arch-commits] Commit in scrapy/trunk (PKGBUILD python310.patch)

[Evangelos Foutras]

    Date: Thursday, December 9, 2021 @ 05:02:07
  Author: foutrelis
Revision: 1065813

Fix a test for Python 3.10

Added:
  scrapy/trunk/python310.patch
Modified:
  scrapy/trunk/PKGBUILD

-----------------+
 PKGBUILD        |    3 +++
 python310.patch |   35 +++++++++++++++++++++++++++++++++++
 2 files changed, 38 insertions(+)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-12-09 04:52:00 UTC (rev 1065812)
+++ PKGBUILD	2021-12-09 05:02:07 UTC (rev 1065813)
@@ -19,12 +19,15 @@
               'python-pyftpdlib' 'python-uvloop')
 optdepends=('ipython: for enhanced support of the interactive scraping shell')
 source=("$pkgname-$pkgver.tar.gz::https://github.com/scrapy/scrapy/archive/$pkgver.tar.gz"
+        python310.patch
         $pkgname-add-peek-method-to-queues.patch::https://github.com/scrapy/scrapy/commit/68379197986a.patch)
 sha512sums=('01a5ab605ba6783567147b7ca8c0dd963266aeb63e8eac19e962ee5d6dda85052c23a4d161ab69f130925b8a6f271ffbc28784a8f7fc0216428b5579eaad47b6'
+            '5a9e7567e7a62d2c7065ce95179f7f35f86d88947f3ba09d7a377318eb989b7799584389ac9223934b2807ba291454c4e1f5bcaad501590056b0c44d75297561'
             'defc36c52bc86d990e36a3de4d2e7bafc6c3183670c9dd99d659f41de9d5ce8247c5cbb0aba9a4a8713d0073498441919e8410975a65ccec8243ca4d31c63336')
 
 prepare() {
   cd scrapy-$pkgver
+  patch -Np1 -i ../python310.patch
   patch -Np1 -i ../$pkgname-add-peek-method-to-queues.patch
   sed -i 's/,<4.0//' setup.py
 }

Added: python310.patch
===================================================================
--- python310.patch	                        (rev 0)
+++ python310.patch	2021-12-09 05:02:07 UTC (rev 1065813)
@@ -0,0 +1,35 @@
+From dd8bf617c02c58270056b5e0821ccdfa682cc818 Mon Sep 17 00:00:00 2001
+From: Andrey Rakhmatullin <wrar at wrar.name>
+Date: Tue, 3 Aug 2021 20:16:29 +0500
+Subject: [PATCH] Fix tests for the 3.10 TypeError message change.
+
+(cherry picked from commit 93bf1ae7e3966d56539411c59d172c2971ee61e0)
+---
+ tests/test_request_cb_kwargs.py | 14 ++++++++------
+ 1 file changed, 8 insertions(+), 6 deletions(-)
+
+diff --git a/tests/test_request_cb_kwargs.py b/tests/test_request_cb_kwargs.py
+index 145a4e9b..b68184b8 100644
+--- a/tests/test_request_cb_kwargs.py
++++ b/tests/test_request_cb_kwargs.py
+@@ -158,12 +158,14 @@ class CallbackKeywordArgumentsTestCase(TestCase):
+                 if key in line.getMessage():
+                     exceptions[key] = line
+         self.assertEqual(exceptions['takes_less'].exc_info[0], TypeError)
+-        self.assertEqual(
+-            str(exceptions['takes_less'].exc_info[1]),
+-            "parse_takes_less() got an unexpected keyword argument 'number'"
++        self.assertTrue(
++            str(exceptions['takes_less'].exc_info[1]).endswith(
++                "parse_takes_less() got an unexpected keyword argument 'number'"
++            )
+         )
+         self.assertEqual(exceptions['takes_more'].exc_info[0], TypeError)
+-        self.assertEqual(
+-            str(exceptions['takes_more'].exc_info[1]),
+-            "parse_takes_more() missing 1 required positional argument: 'other'"
++        self.assertTrue(
++            str(exceptions['takes_more'].exc_info[1]).endswith(
++                "parse_takes_more() missing 1 required positional argument: 'other'"
++            )
+         )