1.1 --- a/modules.py Mon Mar 13 17:59:13 2017 +0100
1.2 +++ b/modules.py Tue Mar 14 16:40:04 2017 +0100
1.3 @@ -115,7 +115,6 @@
1.4 self.propagate_name_references()
1.5 self.propagate_attr_accesses()
1.6 self.propagate_constants()
1.7 - self.propagate_return_values()
1.8
1.9 def unpropagate(self):
1.10
1.11 @@ -152,7 +151,6 @@
1.12 remove_items(self.importer.all_attr_access_modifiers, self.attr_access_modifiers)
1.13 remove_items(self.importer.all_constants, self.constants)
1.14 remove_items(self.importer.all_constant_values, self.constant_values)
1.15 - remove_items(self.importer.all_return_values, self.return_values)
1.16
1.17 # Remove this module's objects from the importer. Objects are
1.18 # automatically propagated when defined.
1.19 @@ -222,12 +220,6 @@
1.20 self.importer.all_instance_attrs[name] = self.instance_attrs.get(name) or {}
1.21 self.importer.all_instance_attr_constants[name] = self.instance_attr_constants.get(name) or {}
1.22
1.23 - def propagate_return_values(self):
1.24 -
1.25 - "Propagate return values for the module."
1.26 -
1.27 - self.importer.all_return_values.update(self.return_values)
1.28 -
1.29 def set_object(self, name, value=None):
1.30
1.31 "Set an object with the given 'name' and the given 'value'."
1.32 @@ -410,7 +402,6 @@
1.33 self._get_constant_literals(f)
1.34 self._get_constant_values(f)
1.35 self._get_exception_namespaces(f)
1.36 - self._get_return_values(f)
1.37
1.38 finally:
1.39 f.close()
1.40 @@ -631,15 +622,6 @@
1.41 self.exception_namespaces = value and set(value.split(", ")) or set()
1.42 f.readline()
1.43
1.44 - def _get_return_values(self, f):
1.45 - f.readline() # "return values:"
1.46 - line = f.readline().rstrip()
1.47 - while line:
1.48 - path, values = self._get_fields(line)
1.49 - values = values.split(", ")
1.50 - self.return_values[path] = map(decode_reference, values)
1.51 - line = f.readline().rstrip()
1.52 -
1.53 # Generic parsing methods.
1.54
1.55 def from_lines(self, f, d):
1.56 @@ -897,13 +879,6 @@
1.57 paths.sort()
1.58 print >>f, ", ".join(paths)
1.59
1.60 - print >>f
1.61 - print >>f, "return values:"
1.62 - paths = self.return_values.keys()
1.63 - paths.sort()
1.64 - for path in paths:
1.65 - print >>f, path, ", ".join(map(str, self.return_values[path]))
1.66 -
1.67 finally:
1.68 f.close()
1.69