use os.path.join instead of +

physiopy · Jun 18, 2020 · e49a296 · e49a296
1 parent a56eacc
commit e49a296
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/phys2bids/phys2bids.py b/phys2bids/phys2bids.py
@@ -133,7 +133,7 @@ def phys2bids(filename, info=False, indir='.', outdir='.', heur_file=None,
     outdir = utils.check_input_dir(outdir)
     utils.path_exists_or_make_it(outdir)
     # generate extra path
-    extra_dir = outdir + '/bids_ignore'
+    extra_dir = os.path.join(outdir, 'bids_ignore')
     utils.path_exists_or_make_it(extra_dir)
     # Create logfile name
     basename = 'phys2bids_'

diff --git a/phys2bids/tests/test_integration.py b/phys2bids/tests/test_integration.py
@@ -34,7 +34,7 @@ def test_logger(multifreq_lab_file):
     test_chtrig = 3
     test_ntp = 1
     test_outdir = test_path
-    extra_dir = test_path + '/bids_ignore/'
+    extra_dir = os.path.join(test_path, 'bids_ignore')
     # Phys2bids call through terminal
     subprocess.run(f'phys2bids -in {test_filename} -indir {test_path} '
                    f'-chtrig {test_chtrig} -ntp {test_ntp} -outdir {test_outdir}',
@@ -60,7 +60,7 @@ def test_integration_txt(samefreq_short_txt_file):
 
     test_path, test_filename = os.path.split(samefreq_short_txt_file)
     test_chtrig = 2
-    extra_dir = test_path + '/bids_ignore/'
+    extra_dir = os.path.join(test_path, 'bids_ignore')
 
     phys2bids(filename=test_filename, indir=test_path, outdir=test_path,
               chtrig=test_chtrig, num_timepoints_expected=1)
@@ -112,7 +112,7 @@ def test_integration_acq(samefreq_full_acq_file):
 
     test_path, test_filename = os.path.split(samefreq_full_acq_file)
     test_chtrig = 3
-    extra_dir = test_path + '/bids_ignore/'
+    extra_dir = os.path.join(test_path, 'bids_ignore')
 
     phys2bids(filename=test_filename, indir=test_path, outdir=test_path,
               chtrig=test_chtrig, num_timepoints_expected=1)
@@ -165,7 +165,7 @@ def test_integration_multifreq(multifreq_lab_file):
 
     test_path, test_filename = os.path.split(multifreq_lab_file)
     test_chtrig = 3
-    extra_dir = test_path + '/bids_ignore/'
+    extra_dir = os.path.join(test_path, 'bids_ignore')
 
     phys2bids(filename=test_filename, indir=test_path, outdir=test_path,
               chtrig=test_chtrig, num_timepoints_expected=1)
@@ -313,7 +313,7 @@ def test_integration_heuristic(samefreq_short_txt_file):
     test_full_path = os.path.join(test_path, test_filename)
     test_chtrig = 1
     test_outdir = test_path
-    extra_dir = test_path + '/bids_ignore/'
+    extra_dir = os.path.join(test_path, 'bids_ignore')
     test_ntp = 158
     test_tr = 1.2
     test_thr = 0.735
@@ -390,7 +390,7 @@ def test_integration_info(samefreq_short_txt_file):
     test_ntp = 158
     test_tr = 1.2
     test_thr = 0.735
-    extra_dir = test_path + '/bids_ignore/'
+    extra_dir = os.path.join(test_path, 'bids_ignore')
     # Move into folder
     subprocess.run(f'cd {test_path}', shell=True, check=True)
     # Phys2bids call through terminal