# HG changeset patch # User catherine@Elli.myhome.westell.com # Date 1237186017 14400 # Node ID 68c03076c9e7b0a1080c322ac2ba8c557818a393 # Parent 500955dece3f8c3d517d478bb7575f99b6f75d0d multiple connections diff -r 500955dece3f -r 68c03076c9e7 cmd2.py --- a/cmd2.py Sat Mar 14 20:05:15 2009 -0400 +++ b/cmd2.py Mon Mar 16 02:46:57 2009 -0400 @@ -81,13 +81,17 @@ return if hasattr(opts, '_exit'): return None - terminator = arg.parsed.terminator - try: - if arg.parsed.terminator[0] == '\n': - terminator = arg.parsed.terminator[0] - except IndexError: - pass - arg = arg.parser('%s %s%s%s' % (arg.parsed.command, newArgs, terminator, arg.parsed.suffix)) + if hasattr(arg, 'parser'): + terminator = arg.parsed.terminator + try: + if arg.parsed.terminator[0] == '\n': + terminator = arg.parsed.terminator[0] + except IndexError: + pass + arg = arg.parser('%s %s%s%s' % (arg.parsed.command, newArgs, + terminator, arg.parsed.suffix)) + else: + arg = newArgs result = func(instance, arg, opts) return result newFunc.__doc__ = '%s\n%s' % (func.__doc__, optionParser.format_help())