From c94b5097ece91d3207b7f2e3b3363227d43526be Mon Sep 17 00:00:00 2001 From: Diane Trout Date: Mon, 2 Feb 2015 14:40:47 -0800 Subject: [PATCH] Replace elif list() > int() with else the expression was always true under python2 and is a syntax error in python3. Replacing it with if len(list()) > 0 caused test case failures so this seemed like the best idea. --- htsworkflow/pipelines/ipar.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/htsworkflow/pipelines/ipar.py b/htsworkflow/pipelines/ipar.py index 8719a06..4b0c57e 100644 --- a/htsworkflow/pipelines/ipar.py +++ b/htsworkflow/pipelines/ipar.py @@ -230,13 +230,12 @@ def ipar(pathname): if not (groups[0] == 'IPAR' or groups[0] == 'Intensities'): raise ValueError('ipar can only process IPAR directories') - bustard_pattern = os.path.join(pathname, 'Bustard*') # contents of the matrix file? matrix_pathname = os.path.join(pathname, 'Matrix', 's_matrix.txt') if os.path.exists(matrix_pathname): # this is IPAR_1.01 i.matrix = open(matrix_pathname, 'r').read() - elif glob(bustard_pattern) > 0: + else: i.matrix = None # its still live. -- 2.30.2