[arch-commits] Commit in python-testtools/trunk (PKGBUILD python-3.7.patch)

[Evangelos Foutras]

    Date: Wednesday, October 30, 2019 @ 09:59:49
  Author: foutrelis
Revision: 520962

Fix build with Python 3.7+

Added:
  python-testtools/trunk/python-3.7.patch
Modified:
  python-testtools/trunk/PKGBUILD

------------------+
 PKGBUILD         |    8 ++++++--
 python-3.7.patch |   38 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 44 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-10-30 09:21:03 UTC (rev 520961)
+++ PKGBUILD	2019-10-30 09:59:49 UTC (rev 520962)
@@ -13,12 +13,16 @@
              'python-fixtures' 'python2-fixtures' 'python-mimeparse' 'python2-mimeparse'
              'python2-unittest2' 'python2-traceback2')
 checkdepends=('python-testscenarios' 'python2-testscenarios')
-source=("$pkgbase-$pkgver.tar.gz::https://github.com/testing-cabal/testtools/archive/$pkgver.tar.gz")
-sha512sums=('7c3b9e180c5f22d613763446525fcb3f7f260d79bc875669134c3077af0e0d3e101863429e0469ffcb26fd0755b2c915454abc949be864639a2faa9cf5024c62')
+source=("$pkgbase-$pkgver.tar.gz::https://github.com/testing-cabal/testtools/archive/$pkgver.tar.gz"
+        'python-3.7.patch')
+sha512sums=('7c3b9e180c5f22d613763446525fcb3f7f260d79bc875669134c3077af0e0d3e101863429e0469ffcb26fd0755b2c915454abc949be864639a2faa9cf5024c62'
+            '12430f9b813fea33b4e7530d446f5eebfe65785f4132b8732f771cbe72ed23bfdf3841db0a85ffab58f518bccbb5cf2711b62021b9ee294a9efc28b5df59d411')
 
 prepare() {
   cp -a testtools-$pkgver{,-py2}
 
+  patch -Np1 -d testtools-$pkgver <python-3.7.patch
+
   # These are for python 2.x and old python 3.x only
   sed -i 's|unittest2|unittest|' testtools-$pkgver/testtools/tests/test_run.py \
                                  testtools-$pkgver/testtools/tests/test_testsuite.py \

Added: python-3.7.patch
===================================================================
--- python-3.7.patch	                        (rev 0)
+++ python-3.7.patch	2019-10-30 09:59:49 UTC (rev 520962)
@@ -0,0 +1,38 @@
+From 29004731f9c480b7c44a9c2605513d50d372898f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro at hroncok.cz>
+Date: Thu, 17 May 2018 17:52:26 +0200
+Subject: [PATCH] Fix the tests on Python 3.7
+
+Exception's repr got changed not to include trailing comma
+
+Fixes https://github.com/testing-cabal/testtools/issues/270
+
+diff --git a/testtools/tests/matchers/test_exception.py b/testtools/tests/matchers/test_exception.py
+index 6cd80af1..acd39252 100644
+--- a/testtools/tests/matchers/test_exception.py
++++ b/testtools/tests/matchers/test_exception.py
+@@ -32,15 +32,22 @@ class TestMatchesExceptionInstanceInterface(TestCase, TestMatchersInterface):
+     matches_matches = [error_foo]
+     matches_mismatches = [error_bar, error_base_foo]
+ 
++    if sys.version_info >= (3, 7):
++        # exception's repr has changed
++        _e = ''
++    else:
++        _e = ','
++
+     str_examples = [
+-        ("MatchesException(Exception('foo',))",
++        ("MatchesException(Exception('foo'%s))" % _e,
+          MatchesException(Exception('foo')))
+         ]
+     describe_examples = [
+         ("%r is not a %r" % (Exception, ValueError),
+          error_base_foo,
+          MatchesException(ValueError("foo"))),
+-        ("ValueError('bar',) has different arguments to ValueError('foo',).",
++        ("ValueError('bar'%s) has different arguments to ValueError('foo'%s)."
++         % (_e, _e),
+          error_bar,
+          MatchesException(ValueError("foo"))),
+         ]