From ebc5559e751c92649c528948d33046465ae18e80 Mon Sep 17 00:00:00 2001 From: ilovezfs Date: Sat, 30 Jun 2018 04:27:37 -0700 Subject: [PATCH] diffoscope 98 Closes #29584. Signed-off-by: ilovezfs --- Formula/diffoscope.rb | 34 ++-------------------------------- 1 file changed, 2 insertions(+), 32 deletions(-) diff --git a/Formula/diffoscope.rb b/Formula/diffoscope.rb index b794eaf619..1715fba74a 100644 --- a/Formula/diffoscope.rb +++ b/Formula/diffoscope.rb @@ -1,9 +1,8 @@ class Diffoscope < Formula desc "In-depth comparison of files, archives, and directories" homepage "https://diffoscope.org" - url "https://files.pythonhosted.org/packages/d6/47/cd80c971736581fb8d67c9e43f2cfc8a119c3851ed7c4430c476b06b132d/diffoscope-97.tar.gz" - sha256 "93a1e97665eaefdd1a7272ec594aa8bf587955268ada6b3fdbdaa5567aa7cd08" - revision 1 + url "https://files.pythonhosted.org/packages/3a/3e/308a04b435a6c8c9956656b7f2a66d6ed38d5972df453d70202834c4ff43/diffoscope-98.tar.gz" + sha256 "7863d56a3ca3bce9dd206e8b1a6199dda464df92e051a9b475e2e3093cfbf472" bottle do cellar :any_skip_relocation @@ -17,9 +16,6 @@ class Diffoscope < Formula depends_on "gnu-tar" depends_on "python" - # Python 3.7 compat - patch :DATA - resource "libarchive-c" do url "https://files.pythonhosted.org/packages/b9/2c/c975b3410e148dab00d14471784a743268614e21121e50e4e00b13f38370/libarchive-c-2.8.tar.gz" sha256 "06d44d5b9520bdac93048c72b7ed66d11a6626da16d2086f9aad079674d8e061" @@ -56,29 +52,3 @@ class Diffoscope < Formula system "#{bin}/diffoscope", "test1", "test2" end end - -__END__ -diff --git a/diffoscope/presenters/formats.py b/diffoscope/presenters/formats.py -index 24b7190..df84fe2 100644 ---- a/diffoscope/presenters/formats.py -+++ b/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() - ) -diff --git a/diffoscope/comparators/json.py b/diffoscope/comparators/json.py -index 41c5ec7..8e210b9 100644 ---- a/diffoscope/comparators/json.py -+++ b/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)