command: add command.Arg type

This type represents an argument to a command passed to another command. This
improves help text, and will be used in the partial parser to expand subcommand
types.

1 files changed, 9 insertions, 4 deletions

diff --git a/mitmproxy/command.py b/mitmproxy/command.py
index 7374a19a..087f7770 100644
--- a/mitmproxy/command.py
+++ b/mitmproxy/command.py
@@ -17,7 +17,8 @@ from mitmproxy import flow
 
 def lexer(s):
     # mypy mis-identifies shlex.shlex as abstract
-    lex = shlex.shlex(s, punctuation_chars=True)  # type: ignore
+    lex = shlex.shlex(s)  # type: ignore
+    lex.wordchars += "."
     lex.whitespace_split = True
     lex.commenters = ''
     return lex
@@ -36,6 +37,10 @@ class Cmd(str):
     pass
 
 
+class Arg(str):
+    pass
+
+
 def typename(t: type, ret: bool) -> str:
     """
         Translates a type to an explanatory string. If ret is True, we're
@@ -157,7 +162,7 @@ class CommandManager:
             Parse a possibly partial command. Return a sequence of (part, type) tuples.
         """
         buf = io.StringIO(cmdstr)
-        parts: typing.List[str] = []
+        parts = []  # type: typing.List[str]
         lex = lexer(buf)
         while 1:
             remainder = cmdstr[buf.tell():]
@@ -174,8 +179,8 @@ class CommandManager:
         elif cmdstr.endswith(" "):
             parts.append("")
 
-        parse: typing.List[ParseResult] = []
-        params: typing.List[type] = []
+        parse = []  # type: typing.List[ParseResult]
+        params = []  # type: typing.List[type]
         for i in range(len(parts)):
             if i == 0:
                 params[:] = [Cmd]