0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move from optparse to argparse

Browse source
This commit is contained in:
Alexander van Gessel 2013-08-04 22:54:59 +02:00
parent a89e9c4329
commit 2a13cfd439
1 changed files with 26 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
data/tools/wesnoth/wmlparser.py
View file

@ -861,7 +861,7 @@ def xmlify(tree, verbose=False, depth=0):
escape(child.get_value()) + '</' + child.name + '>'
if __name__ == "__main__":
import optparse, subprocess
import argparse, subprocess
try: import psyco
except ImportError: pass
else: psyco.full()
@ -869,27 +869,28 @@ if __name__ == "__main__":
# Hack to make us not crash when we encounter characters that aren't ASCII
sys.stdout = __import__("codecs").getwriter('utf-8')(sys.stdout)
optionparser = optparse.OptionParser()
optionparser.set_usage("usage: %prog [options] [filename]")
optionparser.add_option("-p", "--path", help = "specify wesnoth data path")
optionparser.add_option("-C", "--color", action = "store_true",
argumentparser = argparse.ArgumentParser("usage: %(prog)s [options]")
argumentparser.add_argument("-p", "--path", help = "specify wesnoth data path")
argumentparser.add_argument("-C", "--color", action = "store_true",
help = "use colored output")
optionparser.add_option("-u", "--userpath", help = "specify userdata path")
optionparser.add_option("-e", "--execute", help = "execute given WML")
optionparser.add_option("-v", "--verbose", action = "store_true",
argumentparser.add_argument("-u", "--userpath", help = "specify userdata path")
argumentparser.add_argument("-e", "--execute", help = "execute given WML")
argumentparser.add_argument("-v", "--verbose", action = "store_true",
help = "make the parser very verbose")
optionparser.add_option("-n", "--no-macros", action = "store_true",
argumentparser.add_argument("-n", "--no-macros", action = "store_true",
help = "do not expand any macros")
optionparser.add_option("-c", "--contents", action = "store_true",
argumentparser.add_argument("-c", "--contents", action = "store_true",
help = "display contents of every tag")
optionparser.add_option("-j", "--to-json", action = "store_true",
argumentparser.add_argument("-j", "--to-json", action = "store_true",
help = "output JSON version of tree")
optionparser.add_option("-x", "--to-xml", action = "store_true",
argumentparser.add_argument("-x", "--to-xml", action = "store_true",
help = "output XML version of tree")
options, args = optionparser.parse_args()
argumentparser.add_argument("filename", nargs = "?",
help = "file to parse")
args = argumentparser.parse_args()
if options.path:
path = options.path
if args.path:
path = args.path
else:
try:
p = subprocess.Popen(["wesnoth", "--path"], stdout = subprocess.PIPE)
@ -899,11 +900,11 @@ if __name__ == "__main__":
sys.stderr.write("Could not determine Wesnoth path.\n")
path = None
wmlparser = Parser(path, options.userpath)
if options.no_macros:
wmlparser = Parser(path, args.userpath)
if args.no_macros:
wmlparser.no_macros = True
if options.verbose:
if args.verbose:
wmlparser.verbose = True
def gt(domain, x):
print "gettext: '%s' '%s'" % (domain, x)
@ -912,19 +913,19 @@ if __name__ == "__main__":
wmlparser.do_preprocessor_logic = True
if options.execute:
wmlparser.parse_text(options.execute)
elif args:
wmlparser.parse_file(args[0])
if args.execute:
wmlparser.parse_text(args.execute)
elif args.filename:
wmlparser.parse_file(args.filename)
else:
wmlparser.parse_stream(sys.stdin)
data = wmldata.DataSub("WML")
wmlparser.parse_top(data)
if options.to_json:
if args.to_json:
jsonify(data, True) # For more readable results
elif options.to_xml:
elif args.to_xml:
xmlify(data, True)
else:
data.debug(show_contents = options.contents, use_color = options.color)
data.debug(show_contents = args.contents, use_color = args.color)