details: http://www.bx.psu.edu/hg/galaxy/rev/109e94372abb changeset: 2868:109e94372abb user: Ross Lazarus <ross.lazarus@gmail.com> date: Sun Oct 11 09:45:38 2009 -0400 description: added 2 valid chars ;| and patch for empty url_paste in composite upload 2 file(s) affected in this change: lib/galaxy/tools/parameters/grouping.py lib/galaxy/util/__init__.py diffs (24 lines): diff -r 5391edcf618d -r 109e94372abb lib/galaxy/tools/parameters/grouping.py --- a/lib/galaxy/tools/parameters/grouping.py Sun Oct 11 09:37:43 2009 -0400 +++ b/lib/galaxy/tools/parameters/grouping.py Sun Oct 11 09:45:38 2009 -0400 @@ -226,7 +226,7 @@ if context.get( 'space_to_tab', None ) not in ["None", None]: space_to_tab = True file_bunch = get_data_file_filename( data_file, override_name = name, override_info = info ) - if file_bunch.path: + if file_bunch.path and url_paste: if url_paste.strip(): warnings.append( "All file contents specified in the paste box were ignored." ) else: #we need to use url_paste diff -r 5391edcf618d -r 109e94372abb lib/galaxy/util/__init__.py --- a/lib/galaxy/util/__init__.py Sun Oct 11 09:37:43 2009 -0400 +++ b/lib/galaxy/util/__init__.py Sun Oct 11 09:45:38 2009 -0400 @@ -109,7 +109,7 @@ return text # characters that are valid -valid_chars = set(string.letters + string.digits + " -=_.()/+*^,:?!") +valid_chars = set(string.letters + string.digits + " -=_.()/+*^,:?!;|") # characters that are allowed but need to be escaped mapped_chars = { '>' :'__gt__',