Changeset 3933:84a390ea9119 in livinglogic.python.xist for src/ll/xist/scripts/xml2xsc.py

Show
Ignore:
Timestamp:
02/27/10 18:14:19 (10 years ago)
Author:
Walter Doerwald <walter@…>
Parents:
3928:97eaeaf5656b (diff), 3932:515c28c99841 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Branch:
default
Message:

Merged in release 3.7.3.

Files:
2 modified

Legend:

Unmodified
Added
Removed
  • src/ll/xist/scripts/xml2xsc.py

    r3893 r3933  
    22# -*- coding: utf-8 -*- 
    33 
    4 ## Copyright 1999-2009 by LivingLogic AG, Bayreuth/Germany 
    5 ## Copyright 1999-2009 by Walter Dörwald 
     4## Copyright 1999-2010 by LivingLogic AG, Bayreuth/Germany 
     5## Copyright 1999-2010 by Walter Dörwald 
    66## 
    77## All Rights Reserved 
  • src/ll/xist/scripts/xml2xsc.py

    r3930 r3933  
    106106                    entry[0].modelargs = elements 
    107107    else: 
    108         raise ValueError("unknown sims mode %r" % sims) 
     108        raise ValueError("unknown sims mode {0!r}".format(sims)) 
    109109    return ns 
    110110 
     
    118118        node = etree.parse(stream).getroot() 
    119119    else: 
    120         raise ValueError("unknown parser %r" % parser) 
     120        raise ValueError("unknown parser {0!r}".format(parser)) 
    121121     
    122122    return etree2xnd(sims, node) 
     
    127127    p.add_option("-p", "--parser", dest="parser", help="parser module to use for XML parsing (etree or lxml)", choices=("etree", "lxml"), default="etree") 
    128128    choices = ["none", "simple", "full"] 
    129     p.add_option("-s", "--sims", dest="sims", help="Create sims info? (%s)" % ", ".join(choices), metavar="MODE", default="simple") 
     129    p.add_option("-s", "--sims", dest="sims", help="Create sims info? ({0})".format(", ".join(choices)), metavar="MODE", default="simple") 
    130130 
    131131    (options, args) = p.parse_args(args)