2 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/3667a65b86a9/ Changeset: 3667a65b86a9 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 8882e45504a37ab9f87f2872df2a6749673bd741 -r 3667a65b86a9418bc67c89ce0fdfd0dfc55a0021 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/d3be8f8f8096/ Changeset: d3be8f8f8096 User: dan Date: 2013-05-14 19:13:21 Summary: Use util.unicodify when generating dataset peeks. Affected #: 1 file diff -r 3667a65b86a9418bc67c89ce0fdfd0dfc55a0021 -r d3be8f8f8096ad723644019bd742904046df54ba lib/galaxy/datatypes/data.py --- a/lib/galaxy/datatypes/data.py +++ b/lib/galaxy/datatypes/data.py @@ -865,7 +865,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.