Changeset 4b68c58

Timestamp:

May 19, 2010 7:22:16 AM (15 years ago)

Author:

Ted Faber <faber@…>

Branches:

axis_example, compt_changes, info-ops, master, version-3.01, version-3.02

Children:

11867dde

Parents:

df3179c

Message:

COnsistency no one cares about but me. plus 0 exit status.

File:

• fedd/compose.py (modified) (6 diffs)

fedd/compose.py

@@ -439 +439 @@
     return (top, marks)
 
-def import_topdl_component(fn):
+def import_xml_component(fn):
     """
     Pull a component in from a topdl description.
@@ -474 +474 @@
     given by format if any.  If both are None, output to stdout in topdl
     """
-    def topdl_out(f, top, constraints):
+    def xml_out(f, top, constraints):
         """
         Output into topdl.  Just call the topdl output, as the constraint
@@ -516 +516 @@
     # Info to map from format to output routine.  
     exporters = {
-            'xml':topdl_out, 'topdl':topdl_out,
+            'xml':xml_out, 'topdl':xml_out,
             'tcl': ns2_out, 'ns': ns2_out,
             }
@@ -535 +535 @@
     else:
         # Both outfile and format are empty
-        exporter = topdl_out
+        exporter = xml_out
 
     # The actual output.  Open the file, if any, and call the exporter
@@ -557 +557 @@
             'tcl': import_ns2_component, 
             'ns': import_ns2_component, 
-            'xml':import_topdl_component,
-            'topdl':import_topdl_component,
+            'xml':import_xml_component,
+            'topdl':import_xml_component,
             }
     names = set()
@@ -668 +668 @@
 output_composition(comp, [c for c in constraints if not c.match], 
         opts.outfile, opts.format)
+
+sys.exit(0)