Commit 62e8df89 authored by Marco Clemencic's avatar Marco Clemencic

Merge branch 'make-toolhandlearray-consistent-with-toolhandle' into 'master'

make GaudiHandleArray.__str__ consistent with GaudiHandle.__str__

See merge request !1070
parents b5d5bd22 5279db30
Pipeline #1726302 passed with stages
in 23 minutes and 16 seconds
...@@ -138,17 +138,12 @@ class GaudiHandleArray(list): ...@@ -138,17 +138,12 @@ class GaudiHandleArray(list):
def __repr__(self): def __repr__(self):
"""Return class name with list of type/name strings as argument""" """Return class name with list of type/name strings as argument"""
rep = self.__class__.__name__ + '([' return self.__class__.__name__ + '([' + ','.join(
for h in self: repr(h.toStringProperty()) for h in self) + '])'
rep += repr(h.toStringProperty()) + ','
# remove last comma
if rep[-1] == ',':
rep = rep[:-1]
return rep + '])'
def __str__(self): def __str__(self):
"""Print in a form which can be parsed""" """Print in a form which can be parsed"""
return str([str(s) for s in self]) return self.toStringProperty()
#shortName = self.__class__.__name__ #shortName = self.__class__.__name__
#return "%s:%s" % (shortName, #return "%s:%s" % (shortName,
# linesep + linesep.join([str(s) for s in self])) # linesep + linesep.join([str(s) for s in self]))
...@@ -223,14 +218,7 @@ class GaudiHandleArray(list): ...@@ -223,14 +218,7 @@ class GaudiHandleArray(list):
# Member functions which are the same as Configurables # Member functions which are the same as Configurables
# #
def toStringProperty(self): def toStringProperty(self):
rep = '[' return '[' + ','.join(repr(v.toStringProperty()) for v in self) + ']'
# add entries
for v in self:
rep += repr(v.toStringProperty()) + ','
# remove last comma
if rep[-1] == ',':
rep = rep[:-1]
return rep + ']'
class ServiceHandleArray(GaudiHandleArray): class ServiceHandleArray(GaudiHandleArray):
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment