3 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/7228d0eac7b1/ Changeset: 7228d0eac7b1 User: dan Date: 2013-05-22 15:51:47 Summary: Fix for RawObjectWrapper when None values are provided. Affected #: 1 file diff -r feaab01c738a077719dd2bc90734e6ecde72d68e -r 7228d0eac7b183dca69c41725dc73bf5dedf8d0b lib/galaxy/tools/__init__.py --- a/lib/galaxy/tools/__init__.py +++ b/lib/galaxy/tools/__init__.py @@ -3264,7 +3264,11 @@ 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 ) https://bitbucket.org/galaxy/galaxy-central/commits/6f6ea9a765f6/ Changeset: 6f6ea9a765f6 Branch: next-stable User: dan Date: 2013-05-22 15:51:47 Summary: Fix for RawObjectWrapper when None values are provided. Affected #: 1 file diff -r 6b766dac9faec6e47fca620b514306149954811b -r 6f6ea9a765f6a0824fe0500e9b656f86143aa44c lib/galaxy/tools/__init__.py --- a/lib/galaxy/tools/__init__.py +++ b/lib/galaxy/tools/__init__.py @@ -3264,7 +3264,11 @@ 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 ) https://bitbucket.org/galaxy/galaxy-central/commits/9d2b0932e6b4/ Changeset: 9d2b0932e6b4 User: dan Date: 2013-05-22 15:53:04 Summary: merge Affected #: 1 file diff -r b45cefc2901c6434acb7d9f5ab841e0554e81f17 -r 9d2b0932e6b43f6e8c5fa7525e10d70b799fdf17 lib/galaxy/tools/__init__.py --- a/lib/galaxy/tools/__init__.py +++ b/lib/galaxy/tools/__init__.py @@ -3264,7 +3264,11 @@ 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 ) 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.