aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2016-05-23 11:47:16 -0700
committerMaximilian Hils <git@maximilianhils.com>2016-05-23 11:47:16 -0700
commit354b8f84dfbfcc7dfe69a6ad847aa95d64a30330 (patch)
tree48622b621818953dd901ec7dd0a4d6ac64ab6da8
parentc160a47e51aa86283c6be9315c35bf3a9f6b68e4 (diff)
downloadmitmproxy-354b8f84dfbfcc7dfe69a6ad847aa95d64a30330.tar.gz
mitmproxy-354b8f84dfbfcc7dfe69a6ad847aa95d64a30330.tar.bz2
mitmproxy-354b8f84dfbfcc7dfe69a6ad847aa95d64a30330.zip
minor fixes (#1165)
-rw-r--r--mitmproxy/console/__init__.py4
-rw-r--r--mitmproxy/console/grideditor.py1
-rw-r--r--mitmproxy/utils.py4
3 files changed, 2 insertions, 7 deletions
diff --git a/mitmproxy/console/__init__.py b/mitmproxy/console/__init__.py
index e75aed86..1dd032be 100644
--- a/mitmproxy/console/__init__.py
+++ b/mitmproxy/console/__init__.py
@@ -58,7 +58,7 @@ class ConsoleState(flow.State):
return f
def set_limit(self, limit):
- ret = flow.State.set_limit(self, limit)
+ ret = super(ConsoleState, self).set_limit(limit)
self.set_focus(self.focus)
return ret
@@ -102,7 +102,7 @@ class ConsoleState(flow.State):
self.focus -= 1
if self.focus < 0:
self.focus = None
- ret = flow.State.delete_flow(self, f)
+ ret = super(ConsoleState, self).delete_flow(f)
self.set_focus(self.focus)
return ret
diff --git a/mitmproxy/console/grideditor.py b/mitmproxy/console/grideditor.py
index 11ce7d02..ea26d966 100644
--- a/mitmproxy/console/grideditor.py
+++ b/mitmproxy/console/grideditor.py
@@ -5,7 +5,6 @@ import re
import os
import urwid
-from netlib import odict
from netlib.http import user_agents, cookies
from . import common, signals
diff --git a/mitmproxy/utils.py b/mitmproxy/utils.py
index cda5bba6..e56ac473 100644
--- a/mitmproxy/utils.py
+++ b/mitmproxy/utils.py
@@ -1,11 +1,7 @@
from __future__ import (absolute_import, print_function, division)
-import os
import datetime
-import re
import time
import json
-import importlib
-import inspect
import netlib.utils