details: http://www.bx.psu.edu/hg/galaxy/rev/8ac9be4bd716 changeset: 2429:8ac9be4bd716 user: Greg Von Kuster <greg@bx.psu.edu> date: Fri Jun 05 11:33:19 2009 -0400 description: Revert upload.py - didn't mean to commit it. 1 file(s) affected in this change: lib/galaxy/tools/actions/upload.py diffs (28 lines): diff -r 9a71b89082fe -r 8ac9be4bd716 lib/galaxy/tools/actions/upload.py --- a/lib/galaxy/tools/actions/upload.py Fri Jun 05 11:15:25 2009 -0400 +++ b/lib/galaxy/tools/actions/upload.py Fri Jun 05 11:33:19 2009 -0400 @@ -245,14 +245,12 @@ parts = file_name.split( "." ) if len( parts ) > 1: ext = parts[1].strip().lower() - if not( ext == 'ab1' or ext == 'scf' or ext == 'novoindex' ): + if not( ext == 'ab1' or ext == 'scf' ): raise BadFileException( "you attempted to upload an inappropriate file." ) if ext == 'ab1' and file_type != 'ab1': raise BadFileException( "you must manually set the 'File Format' to 'Ab1' when uploading ab1 files." ) elif ext == 'scf' and file_type != 'scf': raise BadFileException( "you must manually set the 'File Format' to 'Scf' when uploading scf files." ) - elif ext == 'novoindex' and file_type != 'novoindex': - raise BadFileException( "you must manually set the 'File Format' to 'NovoIndex' when uploading novoindex files." ) data_type = 'binary' if not data_type: # We must have a text file @@ -338,7 +336,7 @@ return ( False, False, None ) zip_file = zipfile.ZipFile( temp_name, "r" ) # Make sure the archive consists of valid files. The current rules are: - # 1. Archives can only include .ab1, .scf, or .txt files + # 1. Archives can only include .ab1, .scf or .txt files # 2. All file extensions within an archive must be the same name = zip_file.namelist()[0] test_ext = name.split( "." )[1].strip().lower()