Thu Dec 27 15:03:53 2018 UTC ()
Remove trailing comma from generator expressions for Python 3.7 compat.


(joerg)
diff -r1.5 -r1.6 pkgsrc/sysutils/py-diffoscope/distinfo
diff -r0 -r1.1 pkgsrc/sysutils/py-diffoscope/patches/patch-diffoscope_comparators_json.py
diff -r0 -r1.1 pkgsrc/sysutils/py-diffoscope/patches/patch-diffoscope_presenters_formats.py
cvs diff -r1.5 -r1.6 pkgsrc/sysutils/py-diffoscope/distinfo (expand / switch to unified diff)

--- pkgsrc/sysutils/py-diffoscope/distinfo 2018/05/16 06:54:52 1.5
+++ pkgsrc/sysutils/py-diffoscope/distinfo 2018/12/27 15:03:53 1.6
@@ -1,6 +1,8 @@ @@ -1,6 +1,8 @@
1$NetBSD: distinfo,v 1.5 2018/05/16 06:54:52 adam Exp $ 1$NetBSD: distinfo,v 1.6 2018/12/27 15:03:53 joerg Exp $
2 2
3SHA1 (diffoscope-94.tar.gz) = 2dca48b577383377d4bb43d9472ecd9ae5112739 3SHA1 (diffoscope-94.tar.gz) = 2dca48b577383377d4bb43d9472ecd9ae5112739
4RMD160 (diffoscope-94.tar.gz) = 78261a206f3c232c2b5e386eb3b5b6d825a79d56 4RMD160 (diffoscope-94.tar.gz) = 78261a206f3c232c2b5e386eb3b5b6d825a79d56
5SHA512 (diffoscope-94.tar.gz) = a68fda09a8340b1b36683b0bda4c854cb04afb189b0464185b6de655c7fe2e122215612a0154738a1174ca1594bab3598359b10425a2375f692eb0bd089d89f1 5SHA512 (diffoscope-94.tar.gz) = a68fda09a8340b1b36683b0bda4c854cb04afb189b0464185b6de655c7fe2e122215612a0154738a1174ca1594bab3598359b10425a2375f692eb0bd089d89f1
6Size (diffoscope-94.tar.gz) = 9405785 bytes 6Size (diffoscope-94.tar.gz) = 9405785 bytes
 7SHA1 (patch-diffoscope_comparators_json.py) = 6f148f9847f8d0b24007feaeed76265dfb47b8e9
 8SHA1 (patch-diffoscope_presenters_formats.py) = f42ba00bcdf7347ed82c7b6aaff3af17b662b246
File Added: pkgsrc/sysutils/py-diffoscope/patches/Attic/patch-diffoscope_comparators_json.py
$NetBSD: patch-diffoscope_comparators_json.py,v 1.1 2018/12/27 15:03:53 joerg Exp $

--- diffoscope/comparators/json.py.orig	2018-12-25 21:53:50.738372750 +0000
+++ diffoscope/comparators/json.py
@@ -39,7 +39,7 @@ class JSONFile(File):
             # Try fuzzy matching for JSON files
             is_text = any(
                 file.magic_file_type.startswith(x)
-                for x in ('ASCII text', 'UTF-8 Unicode text'),
+                for x in ('ASCII text', 'UTF-8 Unicode text')
             )
             if is_text and not file.name.endswith('.json'):
                 buf = f.read(10)
File Added: pkgsrc/sysutils/py-diffoscope/patches/Attic/patch-diffoscope_presenters_formats.py
$NetBSD: patch-diffoscope_presenters_formats.py,v 1.1 2018/12/27 15:03:53 joerg Exp $

--- diffoscope/presenters/formats.py.orig	2018-12-25 21:54:25.209444143 +0000
+++ diffoscope/presenters/formats.py
@@ -109,5 +109,5 @@ class PresenterManager(object):
         """
 
         return any(
-            x['klass'].supports_visual_diffs for x in self.config.values(),
+            x['klass'].supports_visual_diffs for x in self.config.values()
         )