[arch-commits] Commit in mutagen/trunk (3 files)

[Evangelos Foutras]

    Date: Sunday, July 1, 2018 @ 18:34:11
  Author: foutrelis
Revision: 327907

Add two upstream fixes for pyflakes and pycodestyle

Added:
  mutagen/trunk/disable-pycodestyle-warning-w504.patch
  mutagen/trunk/pyflakes-fixes.patch
Modified:
  mutagen/trunk/PKGBUILD

----------------------------------------+
 PKGBUILD                               |   10 ++++++++--
 disable-pycodestyle-warning-w504.patch |   21 +++++++++++++++++++++
 pyflakes-fixes.patch                   |   23 +++++++++++++++++++++++
 3 files changed, 52 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-07-01 07:41:58 UTC (rev 327906)
+++ PKGBUILD	2018-07-01 18:34:11 UTC (rev 327907)
@@ -12,12 +12,18 @@
 checkdepends=('python-pytest' 'python2-pytest' 'python-hypothesis' 'python2-hypothesis' 'python-pyflakes' 'python2-pyflakes'
               'python-pycodestyle' 'python2-pycodestyle')
 source=($pkgbase-$pkgver.tar.gz::"https://github.com/quodlibet/mutagen/releases/download/release-$pkgver/$pkgbase-$pkgver.tar.gz"
-        $pkgbase-$pkgver.tar.gz.sig::"https://github.com/quodlibet/mutagen/releases/download/release-$pkgver/$pkgbase-$pkgver.tar.gz.sig")
+        $pkgbase-$pkgver.tar.gz.sig::"https://github.com/quodlibet/mutagen/releases/download/release-$pkgver/$pkgbase-$pkgver.tar.gz.sig"
+        pyflakes-fixes.patch
+        disable-pycodestyle-warning-w504.patch)
 sha256sums=('b2a2c2ce87863af12ed7896f341419cd051a3c72c3c6733db9e83060dcadee5e'
-            'SKIP')
+            'SKIP'
+            '201f81d44c497544c6f86a186964abeae27f254db5c026802245217b359516f6'
+            'da9f8adf4fa1567957732e9f2399d4397579f990cd6046eaac40b177e8578f89')
 validpgpkeys=('0EBF782C5D53F7E5FB02A66746BD761F7A49B0EC')
 
 prepare() {
+  patch -d ${pkgbase}-${pkgver} -Np1 < pyflakes-fixes.patch
+  patch -d ${pkgbase}-${pkgver} -Np1 < disable-pycodestyle-warning-w504.patch
   cp -r ${pkgbase}-${pkgver} python-${pkgbase}-${pkgver}
 }
 

Added: disable-pycodestyle-warning-w504.patch
===================================================================
--- disable-pycodestyle-warning-w504.patch	                        (rev 0)
+++ disable-pycodestyle-warning-w504.patch	2018-07-01 18:34:11 UTC (rev 327907)
@@ -0,0 +1,21 @@
+From 6e3e20a80ba38832413696452d297c4765f14ffd Mon Sep 17 00:00:00 2001
+From: Christoph Reiter <reiter.christoph at gmail.com>
+Date: Sun, 27 May 2018 10:51:54 +0200
+Subject: [PATCH] Disable a new pycodestyle warning
+
+---
+ setup.cfg | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/setup.cfg b/setup.cfg
+index 68d10b7..96f7216 100644
+--- a/setup.cfg
++++ b/setup.cfg
+@@ -6,6 +6,6 @@ omit=
+     mutagen/_senf/*
+ 
+ [flake8]
+-ignore=E128,W601,E402,E731,W503,E741,E305,E121,E124
++ignore=E128,W601,E402,E731,W503,E741,E305,E121,E124,W504
+ builtins=cmp,unicode,long,xrange,basestring
+ exclude=

Added: pyflakes-fixes.patch
===================================================================
--- pyflakes-fixes.patch	                        (rev 0)
+++ pyflakes-fixes.patch	2018-07-01 18:34:11 UTC (rev 327907)
@@ -0,0 +1,23 @@
+From 8995681e8e59a8d75d15c8d58fd69b475a04d3c0 Mon Sep 17 00:00:00 2001
+From: Christoph Reiter <reiter.christoph at gmail.com>
+Date: Sun, 27 May 2018 10:23:08 +0200
+Subject: [PATCH] pyflakes fixes
+
+for the new pyflakes release
+---
+ mutagen/id3/_frames.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/mutagen/id3/_frames.py b/mutagen/id3/_frames.py
+index 3ac066d..f50752a 100644
+--- a/mutagen/id3/_frames.py
++++ b/mutagen/id3/_frames.py
+@@ -265,7 +265,7 @@ def _fromData(cls, header, tflags, data):
+             if tflags & Frame.FLAG24_COMPRESS:
+                 try:
+                     data = zlib.decompress(data)
+-                except zlib.error as err:
++                except zlib.error:
+                     # the initial mutagen that went out with QL 0.12 did not
+                     # write the 4 bytes of uncompressed size. Compensate.
+                     data = datalen_bytes + data