opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-24 16:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Improved object attribute naming DatasetCollectionWrapper.

Browse Source 
To try to limit potential ambibuity introduced by (probably mistakenly) allowing syntax such $param.<element_identifier> (e.g. $pair.forward).
This commit is contained in:
John Chilton
2014-07-25 10:28:50 -05:00
parent 1c5691964e
commit 657706dede
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/galaxy/tools/wrappers.py
+8 -8
View File
@@ -300,13 +300,13 @@ class DatasetCollectionWrapper( object, HasDatasets ):
element_instances[element_identifier] = element_wrapper
element_instance_list.append( element_wrapper )
self.element_instances = element_instances
self.element_instance_list = element_instance_list
self.__element_instances = element_instances
self.__element_instance_list = element_instance_list
def keys( self ):
if not self.__input_supplied:
return []
return self.element_instances.keys()
return self.__element_instances.keys()
@property
def is_collection( self ):
@@ -320,21 +320,21 @@ class DatasetCollectionWrapper( object, HasDatasets ):
if not self.__input_supplied:
return None
if isinstance( key, int ):
return self.element_instance_list[ key ]
return self.__element_instance_list[ key ]
else:
return self.element_instances[ key ]
return self.__element_instances[ key ]
def __getattr__( self, key ):
if not self.__input_supplied:
return None
return self.element_instances[ key ]
return self.__element_instances[ key ]
def __iter__( self ):
if not self.__input_supplied:
return [].__iter__()
return self.element_instance_list.__iter__()
return self.__element_instance_list.__iter__()
def __nonzero__( self ):
# Fail `#if $param` checks in cheetah is optional input
# not specified or if resulting collection is empty.
return self.__input_supplied and bool( self.element_instance_list )
return self.__input_supplied and bool( self.__element_instance_list )