aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Austein <sra@hactrn.net>2014-01-13 06:58:45 +0000
committerRob Austein <sra@hactrn.net>2014-01-13 06:58:45 +0000
commit37779a6c590405f250a8f9f7bc3c00cd3489997e (patch)
treea8d66a7bcf51e0a8e5117ce699b8b91c860ac934
parent5d2b16df2d94c2fc5e540c3d8797f27415946e86 (diff)
str.split() -> shlex.split(), cleanup.
svn path=/trunk/; revision=5633
-rw-r--r--rpkid/rpki/cli.py8
1 files changed, 2 insertions, 6 deletions
diff --git a/rpkid/rpki/cli.py b/rpkid/rpki/cli.py
index 7d844509..1930f2b7 100644
--- a/rpkid/rpki/cli.py
+++ b/rpkid/rpki/cli.py
@@ -22,6 +22,7 @@ Utilities for writing command line tools.
import cmd
import glob
+import shlex
import os.path
import argparse
import traceback
@@ -248,11 +249,6 @@ def parsecmd(subparsers, *arg_clauses):
work and I'm not ready to get into that just yet.
"""
- # We probably want to use a customized subclass of ArgumentParser to
- # avoid the exit-on-error behavior. We may also want to use something
- # fancier than plain str.split() to split arguments. Ignore all this
- # for the moment, yak shaving.
-
def decorate(func):
assert func.__name__.startswith("do_")
parser = NonExitingArgumentParser(description = func.__doc__,
@@ -266,7 +262,7 @@ def parsecmd(subparsers, *arg_clauses):
subparser.add_argument(*positional, **keywords)
subparser.set_defaults(func = func)
def wrapped(self, arg):
- return func(self, parser.parse_args(arg.split()))
+ return func(self, parser.parse_args(shlex.split(arg)))
wrapped.argparser = parser
wrapped.__doc__ = func.__doc__
return wrapped