1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/changeset/49f8ed2c6109/ changeset: 49f8ed2c6109 user: dannon date: 2012-03-01 15:31:18 summary: Quick fix for ftp upload unicode normalization failure. TODO: Refactor, shouldn't happen this way. affected #: 1 file diff -r 384549bf99307fed758ea5f3a336e23bf63bc835 -r 49f8ed2c6109024446b30e9110aea274e60378c3 lib/galaxy/tools/parameters/grouping.py --- a/lib/galaxy/tools/parameters/grouping.py +++ b/lib/galaxy/tools/parameters/grouping.py @@ -309,7 +309,7 @@ if ftp_files is not None: # Normalize input paths to ensure utf-8 encoding is normal form c. # This allows for comparison when the filesystem uses a different encoding than the browser. - ftp_files = [unicodedata.normalize('NFC', f) for f in ftp_files] + ftp_files = [unicodedata.normalize('NFC', f) for f in ftp_files if isinstance(f, unicode)] if trans.user is None: log.warning( 'Anonymous user passed values in ftp_files: %s' % ftp_files ) ftp_files = [] @@ -321,7 +321,11 @@ path = relpath( os.path.join( dirpath, filename ), user_ftp_dir ) if not os.path.islink( os.path.join( dirpath, filename ) ): # Normalize filesystem paths - valid_files.append( unicodedata.normalize('NFC', path )) + if isinstance(path, unicode): + valid_files.append(unicodedata.normalize('NFC', path )) + else: + valid_files.append(path) + else: ftp_files = [] for ftp_file in ftp_files: Repository URL: https://bitbucket.org/galaxy/galaxy-central/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email.