aboutsummaryrefslogtreecommitdiffstats
path: root/mitmproxy/addonmanager.py
diff options
context:
space:
mode:
authorAldo Cortesi <aldo@nullcube.com>2017-04-27 17:05:00 +1200
committerAldo Cortesi <aldo@nullcube.com>2017-04-27 17:05:00 +1200
commit97000aa85c6d4cd52d97bda66b0c05ffed93e9da (patch)
treeb5ed172d016a6341e98d2eb765200ba39446b2c2 /mitmproxy/addonmanager.py
parentb7afcb5dc2007ce451161e513d3e55d4cc91379e (diff)
downloadmitmproxy-97000aa85c6d4cd52d97bda66b0c05ffed93e9da.tar.gz
mitmproxy-97000aa85c6d4cd52d97bda66b0c05ffed93e9da.tar.bz2
mitmproxy-97000aa85c6d4cd52d97bda66b0c05ffed93e9da.zip
command: save.file flowspec path -> None
Our first user-facing command. The following commands do the obvious things: save.file @marked /tmp/flows save.file @focus /tmp/flows save.file @hidden /tmp/flows save.file "~m get" /tmp/flows
Diffstat (limited to 'mitmproxy/addonmanager.py')
-rw-r--r--mitmproxy/addonmanager.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/mitmproxy/addonmanager.py b/mitmproxy/addonmanager.py
index 5cfe79f5..ea23b6ff 100644
--- a/mitmproxy/addonmanager.py
+++ b/mitmproxy/addonmanager.py
@@ -145,7 +145,7 @@ class AddonManager:
for a in traverse([addon]):
name = _get_name(a)
if name in self.lookup:
- raise exceptions.AddonError(
+ raise exceptions.AddonManagerError(
"An addon called '%s' already exists." % name
)
l = Loader(self.master)
@@ -175,7 +175,7 @@ class AddonManager:
for a in traverse([addon]):
n = _get_name(a)
if n not in self.lookup:
- raise exceptions.AddonError("No such addon: %s" % n)
+ raise exceptions.AddonManagerError("No such addon: %s" % n)
self.chain = [i for i in self.chain if i is not a]
del self.lookup[_get_name(a)]
with self.master.handlecontext():
@@ -224,7 +224,7 @@ class AddonManager:
func = getattr(a, name, None)
if func:
if not callable(func):
- raise exceptions.AddonError(
+ raise exceptions.AddonManagerError(
"Addon handler %s not callable" % name
)
func(*args, **kwargs)