[diffoscope] 01/01: Revert "comparators.json: Catch bad JSON errors on Python pre-3.5." - moved to 'experimental' branch to keep master <=> unstable.

Chris Lamb chris at chris-lamb.co.uk
Sat Feb 18 03:00:49 CET 2017


This is an automated email from the git hooks/post-receive script.

lamby pushed a commit to branch master
in repository diffoscope.

commit 5f13eda399a57ce6ba9a4ada27b2d7c01fa40987
Author: Chris Lamb <lamby at debian.org>
Date:   Sat Feb 18 15:00:13 2017 +1300

    Revert "comparators.json: Catch bad JSON errors on Python pre-3.5." - moved to 'experimental' branch to keep master <=> unstable.
    
    This reverts commit 31a52f1fafd28b946593847f892d3909dbfd6293.
---
 diffoscope/comparators/json.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/diffoscope/comparators/json.py b/diffoscope/comparators/json.py
index 943ec64..d46c830 100644
--- a/diffoscope/comparators/json.py
+++ b/diffoscope/comparators/json.py
@@ -37,7 +37,7 @@ class JSONFile(File):
         with open(file.path) as f:
             try:
                 file.parsed = json.load(f, object_pairs_hook=collections.OrderedDict)
-            except ValueError:
+            except json.JSONDecodeError:
                 return False
 
         return True

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/diffoscope.git


More information about the diffoscope mailing list