diff --git a/Tools/PyUtils/python/FilePeekerTool.py b/Tools/PyUtils/python/FilePeekerTool.py index b92e41d4bec2347c0cb122aa7bc9abc52ae1e947..cf016252312800943004239d2f4f6c6cbafad32e 100644 --- a/Tools/PyUtils/python/FilePeekerTool.py +++ b/Tools/PyUtils/python/FilePeekerTool.py @@ -63,20 +63,6 @@ class FilePeekerTool(): from PyCool import coral - attribute_methods = dir(coral.Attribute) - methnames = ['data<std::__cxx11::basic_string<char> >', - 'data<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > >', - 'data<std::basic_string<char> >', - 'data<std::string>'] - for m in methnames: - if m in attribute_methods: - attribute_getdata = m - break - else: - raise Exception("Can't find data method in Attribute") - def attr_str_data(attr): - return getattr(attr, attribute_getdata) () - nb = meta.GetEntry( 0 ) esiName= 'Stream' @@ -279,7 +265,7 @@ class FilePeekerTool(): spec = a.specification() a_type = spec.typeName() if a_type.find('string') >= 0: - a_data = attr_str_data(a) + a_data = a.data('string')() # a_data = getattr(a, 'data<std::basic_string<char> >') () try: a_data = eval(a_data,{},{}) @@ -288,7 +274,7 @@ class FilePeekerTool(): pass # print (spec.name(),a_data, file=stdout) else: - a_data = getattr(a,'data<%s>'%a_type)() + a_data = a.data(a_type)() #print ("%s: %s %s" (spec.name(), a_data, type(a_data) ), file=stdout) attr_data.append( (spec.name(), a_data) ) attrs.append(dict(attr_data)) diff --git a/Tools/PyUtils/python/scripts/diff_root_files.py b/Tools/PyUtils/python/scripts/diff_root_files.py index de66a6e5982f6116054aaece648469e08c97fec6..3f14192bdcfb469756bc80a1afbda7e2c77739ef 100644 --- a/Tools/PyUtils/python/scripts/diff_root_files.py +++ b/Tools/PyUtils/python/scripts/diff_root_files.py @@ -222,7 +222,6 @@ def main(args): n_good = 0 n_bad = 0 import collections - from itertools import izip summary = collections.defaultdict(int) if args.order_trees: