passes unit test in boty py3.6 and py 2.7

Author: daeh

heudiconv/cli/run.py

@@ -306,7 +306,12 @@ def process_args(args):
 
         anon_sid = anonymize_sid(sid, args.anon_cmd) if args.anon_cmd else None
         if args.anon_cmd:
+            import sys
+            lgr.info('DEBUGC-version {}'.format(sys.version))
+            lgr.info('DEBUGC-execpath {}'.format(sys.executable))
             lgr.info('Anonymized {} to {}'.format(sid, anon_sid))
+            lgr.info('DEBUGC-type_to_match {}'.format(type(sid)))
+            lgr.info('DEBUGC-type_returned {}'.format(type(anon_sid)))
 
         study_outdir = op.join(outdir, locator or '')
         anon_outdir = args.conv_outdir or outdir

heudiconv/tests/data/anonymize_script.py

@@ -1 +1 @@
-/annex/objects/SHA256E-s391--38015958888dd40f9c1872ee36a5a02587f010e0b2946be8ecd2f23c4970b07d.py
+/annex/objects/SHA256E-s336--b49382e4763607f62d142ff207fd8be214c7860661556a4a929e7edacd777a1f.py

heudiconv/tests/test_regression.py

@@ -19,7 +19,8 @@
 
 @pytest.mark.parametrize('subject', ['sub-sid000143'])
 @pytest.mark.parametrize('heuristic', ['reproin.py'])
-@pytest.mark.parametrize('anon_cmd', [None]) # ['anonymize_script.py']
+# @pytest.mark.parametrize('anon_cmd', [None]) # ['anonymize_script.py']
+@pytest.mark.parametrize('anon_cmd', [None, 'anonymize_script.py']) #
 @pytest.mark.skipif(not have_datalad, reason="no datalad")
 def test_conversion(tmpdir, subject, heuristic, anon_cmd):
     tmpdir.chdir()

heudiconv/tests/utils.py

@@ -18,7 +18,7 @@ def gen_heudiconv_args(datadir, outdir, subject, heuristic_file, anon_cmd=None,
     if xargs:
         args += xargs
 
-    print("DEBUGCUSTOM1")
+    print("DEBUGC-args")
     print(args)
 
     return args

heudiconv/utils.py

@@ -104,8 +104,29 @@ def dec(obj):
 
 def anonymize_sid(sid, anon_sid_cmd):
     from subprocess import check_output
+    import sys
+    print('DEBUGC-version {}'.format(sys.version))
+    print('DEBUGC-execpath {}'.format(sys.executable))
+
+    type_to_match = type(sid)
+    
     cmd = [anon_sid_cmd, sid]
-    anon_sid = check_output(cmd)
+    shell_return = check_output(cmd)
+    
+    type_returned = type(shell_return)
+
+    print('DEBUGC-type_to_match {}'.format(type_to_match))
+    print('DEBUGC-type_returned {}'.format(type_returned))
+    
+    # if type_to_match not type_returned:
+    #     if sys.version_info[0] < 3:
+    #         if type_to_match
+
+    if all([sys.version_info[0] > 2, isinstance(shell_return, bytes), isinstance(sid, str)]):
+        anon_sid = shell_return.decode()
+    else:
+        anon_sid = shell_return
+    
     return anon_sid.strip()