1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/c623f3d38221/ Changeset: c623f3d38221 User: dan Date: 2013-08-07 21:23:30 Summary: Fix for Datatype.matches_any() introduced in 10027:b999689a0130. Fixes issue seen where external display applications requiring format conversions would always fail with server error. Affected #: 1 file diff -r 1f45ab84c1217c0b65a840a90ef60ff267d0d946 -r c623f3d38221c588de3976c05b688387933cbf29 lib/galaxy/datatypes/data.py --- a/lib/galaxy/datatypes/data.py +++ b/lib/galaxy/datatypes/data.py @@ -7,6 +7,7 @@ import tempfile import zipfile from cgi import escape +from inspect import isclass from galaxy import util from galaxy.datatypes.metadata import MetadataElement #import directly to maintain ease of use in Datatype class definitions from galaxy.util import inflector @@ -554,7 +555,7 @@ Check if this datatype is of any of the target_datatypes or is a subtype thereof. """ - datatype_classes = tuple( [ datatype.__class__ for datatype in target_datatypes ] ) + datatype_classes = tuple( [ datatype if isclass( datatype ) else datatype.__class__ for datatype in target_datatypes ] ) return isinstance( self, datatype_classes ) def merge( split_files, output_file): """ 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.