@@ -616,8 +616,9 @@ def _process_files_per_sample_fastq(self, files, prep_info,
616
616
revs = sorted (
617
617
files ['raw_reverse_seqs' ], key = lambda x : x ['filepath' ])
618
618
if len (fwds ) != len (revs ):
619
- raise ValueError (f'The fwd ({ len (fwds )} ) and rev ({ len (revs )} )'
620
- ' files should be of the same length' )
619
+ raise ValueError ('The fwd (' + str (len (fwds )) ') and rev (' +
620
+ str (len (revs )) + ') files should be of the '
621
+ 'same length' )
621
622
622
623
run_prefixes = prep_info ['run_prefix' ].to_dict ()
623
624
@@ -636,15 +637,15 @@ def _process_files_per_sample_fastq(self, files, prep_info,
636
637
run_prefix = rp
637
638
sample_name = sn
638
639
elif fwd_fn .startswith (rp ) and run_prefix is not None :
639
- raise ValueError (
640
- f'Multiple run prefixes match this fwd read: { fwd_fn } ' )
640
+ raise ValueError ('Multiple run prefixes match this fwd '
641
+ ' read: %s' % fwd_fn )
641
642
642
643
if run_prefix is None :
643
644
raise ValueError (
644
- f 'No run prefix matching this fwd read: { fwd_fn } ' )
645
+ 'No run prefix matching this fwd read: %s' % fwd_fn )
645
646
if run_prefix in used_prefixes :
646
647
raise ValueError (
647
- f'Run prefix matches multiple fwd reads: { run_prefix } ' )
648
+ f'Run prefix matches multiple fwd reads: %s' % run_prefix )
648
649
used_prefixes .append (run_prefix )
649
650
650
651
if rev is not None :
@@ -656,7 +657,7 @@ def _process_files_per_sample_fastq(self, files, prep_info,
656
657
if not rev_fn .startswith (run_prefix ):
657
658
raise ValueError (
658
659
'Reverse read does not match run prefix. run_prefix: '
659
- f' { run_prefix } ; files: { fwd_fn } / { rev_fn } ' )
660
+ '%s ; files: %s / %s' ) % ( run_prefix , fwd_fn , rev_fn )
660
661
661
662
used_prefixes .append (run_prefix )
662
663
0 commit comments