From cf6839a9d9e09e2bcb7fcc1acd3ecafa82415748 Mon Sep 17 00:00:00 2001 From: Henrique Date: Wed, 13 Nov 2019 09:26:37 -0500 Subject: Removed an exception handle that can't happen anymore due to the new lexer --- mitmproxy/command.py | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/mitmproxy/command.py b/mitmproxy/command.py index 3da3a298..d9ba4055 100644 --- a/mitmproxy/command.py +++ b/mitmproxy/command.py @@ -165,8 +165,9 @@ class CommandManager(mitmproxy.types._CommandBase): if not t: break parts.append(t) + if not parts: - parts = [""] + parts = [] elif cmdstr.endswith(" "): parts.append("") @@ -233,20 +234,14 @@ class CommandManager(mitmproxy.types._CommandBase): """ Execute a command string. May raise CommandError. """ - if cmdstr == '': - raise exceptions.CommandError("Invalid command: %s" % cmdstr) - - try: - parts, _ = self.parse_partial(cmdstr) - except ValueError as e: - raise exceptions.CommandError("Command error: %s" % e) - if len(parts) == 0: - raise exceptions.CommandError("Invalid command: %s" % cmdstr) - + parts, _ = self.parse_partial(cmdstr) params = [] for p in parts: params.append(p.value) + if len(parts) == 0: + raise exceptions.CommandError("Invalid command: %s" % cmdstr) + return self.call_strings(params[0], params[1:]) def dump(self, out=sys.stdout) -> None: -- cgit v1.2.3