Index: Source/bindings/scripts/compute_interfaces_info_overall.py |
diff --git a/Source/bindings/scripts/compute_interfaces_info_overall.py b/Source/bindings/scripts/compute_interfaces_info_overall.py |
index b2cf5a913bdcdce1df4af69b72d9125c87c0e0d6..658ccfade6f0124a7e48856872002d486e0ff5b6 100755 |
--- a/Source/bindings/scripts/compute_interfaces_info_overall.py |
+++ b/Source/bindings/scripts/compute_interfaces_info_overall.py |
@@ -81,7 +81,7 @@ import cPickle as pickle |
import optparse |
import sys |
-from utilities import write_pickle_file |
+from utilities import read_pickle_files, write_pickle_file |
INHERITED_EXTENDED_ATTRIBUTES = set([ |
'ActiveDOMObject', |
@@ -137,13 +137,6 @@ def dict_of_dicts_of_lists_update_or_append(existing, other): |
# Computations |
################################################################################ |
-def read_interfaces_info(interfaces_info_individual_filenames): |
- # Read in individual info from files |
- for interfaces_info_individual_filename in interfaces_info_individual_filenames: |
- with open(interfaces_info_individual_filename) as interfaces_info_individual_file: |
- yield pickle.load(interfaces_info_individual_file) |
- |
- |
def compute_inheritance_info(interface_name): |
"""Compute inheritance information, namely ancestors and inherited extended attributes.""" |
def generate_ancestors(interface_name): |
@@ -259,7 +252,7 @@ def main(): |
options, args = parse_options() |
# args = Input1, Input2, ..., Output |
interfaces_info_filename = args.pop() |
- info_individuals = read_interfaces_info(args) |
+ info_individuals = read_pickle_files(args) |
compute_interfaces_info_overall(info_individuals) |
write_pickle_file(interfaces_info_filename, |