Changeset 4b68c58


Ignore:
Timestamp:
May 19, 2010 7:22:16 AM (14 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:
1 edited

Legend:

Unmodified
Added
Removed
  • fedd/compose.py

    rdf3179c r4b68c58  
    439439    return (top, marks)
    440440
    441 def import_topdl_component(fn):
     441def import_xml_component(fn):
    442442    """
    443443    Pull a component in from a topdl description.
     
    474474    given by format if any.  If both are None, output to stdout in topdl
    475475    """
    476     def topdl_out(f, top, constraints):
     476    def xml_out(f, top, constraints):
    477477        """
    478478        Output into topdl.  Just call the topdl output, as the constraint
     
    516516    # Info to map from format to output routine. 
    517517    exporters = {
    518             'xml':topdl_out, 'topdl':topdl_out,
     518            'xml':xml_out, 'topdl':xml_out,
    519519            'tcl': ns2_out, 'ns': ns2_out,
    520520            }
     
    535535    else:
    536536        # Both outfile and format are empty
    537         exporter = topdl_out
     537        exporter = xml_out
    538538
    539539    # The actual output.  Open the file, if any, and call the exporter
     
    557557            'tcl': import_ns2_component,
    558558            'ns': import_ns2_component,
    559             'xml':import_topdl_component,
    560             'topdl':import_topdl_component,
     559            'xml':import_xml_component,
     560            'topdl':import_xml_component,
    561561            }
    562562    names = set()
     
    668668output_composition(comp, [c for c in constraints if not c.match],
    669669        opts.outfile, opts.format)
     670
     671sys.exit(0)
Note: See TracChangeset for help on using the changeset viewer.