From 044d221534a4d1bc8ba0153fda74eceaf013f543 Mon Sep 17 00:00:00 2001 From: Greg Von Kuster Date: Fri, 28 Sep 2007 12:55:44 +0000 Subject: [PATCH] Bug fix in sniff.py tabular files will no longer inadvertently be changed to txt. --- lib/galaxy/datatypes/sniff.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/lib/galaxy/datatypes/sniff.py b/lib/galaxy/datatypes/sniff.py index aff73544902..2778735669a 100644 --- a/lib/galaxy/datatypes/sniff.py +++ b/lib/galaxy/datatypes/sniff.py @@ -113,14 +113,16 @@ def is_column_based(fname, sep='\t', skip=0): if not headers: return False for hdr in headers[skip:]: - if len(hdr) > 1 and hdr[0] and not hdr[0].startswith('#'): - count = len(hdr) + if hdr and hdr[0] and not hdr[0].startswith('#'): + if len(hdr) > 1: + count = len(hdr) break if count < 2: return False for hdr in headers[skip:]: - if len(hdr) > 1 and hdr[0] and not hdr[0].startswith('#') and len(hdr) != count: - return False + if hdr and hdr[0] and not hdr[0].startswith('#'): + if len(hdr) != count: + return False return True def guess_ext( fname ):