2 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/6fac39a6786e/ Changeset: 6fac39a6786e Branch: stable User: dan Date: 2013-05-14 19:13:21 Summary: Have datatypes.checkers.check_binary call util.is_binary. Fixes unicode file upload under certain conditions. Affected #: 1 file diff -r 7cf2f256b3d9c32f76567f49a0935b0ca9da9f7e -r 6fac39a6786e555c5bd57f98b4601c9949aae37d lib/galaxy/datatypes/checkers.py --- a/lib/galaxy/datatypes/checkers.py +++ b/lib/galaxy/datatypes/checkers.py @@ -58,7 +58,7 @@ for chars in temp: for char in chars: chars_read += 1 - if ord( char ) > 128: + if util.is_binary( char ): is_binary = True break if chars_read > 100: https://bitbucket.org/galaxy/galaxy-central/commits/686170571216/ Changeset: 686170571216 Branch: stable User: dan Date: 2013-05-14 19:13:21 Summary: Use util.unicodify when generating dataset peeks. Affected #: 1 file diff -r 6fac39a6786e555c5bd57f98b4601c9949aae37d -r 6861705712161c545398e6db1a7cdadda931fc7a lib/galaxy/datatypes/data.py --- a/lib/galaxy/datatypes/data.py +++ b/lib/galaxy/datatypes/data.py @@ -860,7 +860,7 @@ text = "%s file" % file_type else: try: - text = unicode( '\n'.join( lines ), 'utf-8' ) + text = util.unicodify( '\n'.join( lines ) ) except UnicodeDecodeError: text = "binary/unknown file" return text 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.