From fc23abb4754be6eddefae16af3edb5bbed72400a Mon Sep 17 00:00:00 2001 From: Daniel Blankenberg Date: Wed, 22 May 2013 09:51:47 -0400 Subject: [PATCH] Fix for RawObjectWrapper when None values are provided. --- lib/galaxy/tools/__init__.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/galaxy/tools/__init__.py b/lib/galaxy/tools/__init__.py index 686a205e7bd..1b6a2bab78b 100755 --- a/lib/galaxy/tools/__init__.py +++ b/lib/galaxy/tools/__init__.py @@ -3264,7 +3264,11 @@ class RawObjectWrapper( ToolParameterValueWrapper ): def __nonzero__( self ): return bool( self.obj ) #FIXME: would it be safe/backwards compatible to rename .obj to .value, so that we can just inherit this method? def __str__( self ): - return "%s:%s" % (self.obj.__module__, self.obj.__class__.__name__) + try: + return "%s:%s" % (self.obj.__module__, self.obj.__class__.__name__) + except: + #Most likely None, which lacks __module__. + return str( self.obj ) def __getattr__( self, key ): return getattr( self.obj, key )