respond to review

- add explicit py2 check
- change file saving strategy
- use logger instead of print

Author: jdkent

heudiconv/tests/test_utils.py

@@ -2,10 +2,7 @@
 import os
 import os.path as op
 
-try:
-    from json.decoder import JSONDecodeError
-except ImportError:
-    JSONDecodeError = ValueError
+from ..utils import JSONDecodeError, create_tree, save_json
 
 from heudiconv.utils import (
     get_known_heuristics_with_descriptions,
@@ -69,24 +66,21 @@ def test_json_dumps_pretty():
     assert pretty({'WipMemBlock': tstr}) == '{\n  "WipMemBlock": "%s"\n}' % tstr
 
 
-def test_load_json(tmp_path, capsys):
+def test_load_json(tmp_path, caplog):
     # test invalid json
-    icontent = u"I'm Jason Bourne"
-    ifname = "invalid.json"
-    invalid_json_file = tmp_path / ifname
-    invalid_json_file.write_text(icontent)
+    ifname = 'invalid.json'
+    invalid_json_file = str(tmp_path / ifname)
+    create_tree(str(tmp_path), {ifname: u"I'm Jason Bourne"})
 
     with pytest.raises(JSONDecodeError):
         load_json(str(invalid_json_file))
-        captured = capsys.readouterr()
-        assert ifname in captured.out
+
+    assert ifname in caplog.text
 
     # test valid json
     vcontent = {"secret": "spy"}
     vfname = "valid.json"
-    valid_json_file = tmp_path / vfname
-
-    with open(str(valid_json_file), "w") as vj:
-        json.dump(vcontent, vj)
+    valid_json_file = str(tmp_path / vfname)
+    save_json(valid_json_file, vcontent)
 
-    assert load_json(str(valid_json_file)) == vcontent
+    assert load_json(valid_json_file) == vcontent

heudiconv/utils.py

@@ -14,16 +14,16 @@
 from glob import glob
 from subprocess import check_output
 
-try:
-    from json.decoder import JSONDecodeError
-except ImportError:
-    JSONDecodeError = ValueError
-
 from nipype.utils.filemanip import which
 
 import logging
 lgr = logging.getLogger(__name__)
 
+if sys.version_info[0] > 2:
+    from json.decoder import JSONDecodeError
+else:
+    JSONDecodeError = ValueError
+
 
 seqinfo_fields = [
     'total_files_till_now',  # 0
@@ -181,7 +181,7 @@ def load_json(filename):
         with open(filename, 'r') as fp:
             data = json.load(fp)
     except JSONDecodeError:
-        print("{fname} is not a valid json file".format(fname=filename))
+        lgr.error("{fname} is not a valid json file".format(fname=filename))
         raise
 
     return data