aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAldo Cortesi <aldo@nullcube.com>2012-10-29 09:30:59 +1300
committerAldo Cortesi <aldo@nullcube.com>2012-10-29 09:30:59 +1300
commit57d6650e8e1243a66fbaf3d4124c592638e8af91 (patch)
treefb7a9f218bf11f07be6978b97f0f2f9e7962002b
parent68f1000e429913593b7e963ab4a977aaa39a058d (diff)
downloadmitmproxy-57d6650e8e1243a66fbaf3d4124c592638e8af91.tar.gz
mitmproxy-57d6650e8e1243a66fbaf3d4124c592638e8af91.tar.bz2
mitmproxy-57d6650e8e1243a66fbaf3d4124c592638e8af91.zip
Urwid 1.1 compatibility.
-rw-r--r--libmproxy/console/__init__.py4
-rw-r--r--libmproxy/console/flowlist.py4
2 files changed, 4 insertions, 4 deletions
diff --git a/libmproxy/console/__init__.py b/libmproxy/console/__init__.py
index 1153bdcd..544fbd6e 100644
--- a/libmproxy/console/__init__.py
+++ b/libmproxy/console/__init__.py
@@ -431,7 +431,7 @@ class ConsoleMaster(flow.FlowMaster):
return str(v)
self.stream_path = path
-
+
def _run_script_method(self, method, s, f):
status, val = s.run(method, f)
if val:
@@ -1007,7 +1007,7 @@ class ConsoleMaster(flow.FlowMaster):
self.eventlist.append(e)
if len(self.eventlist) > EVENTLOG_SIZE:
self.eventlist.pop(0)
- self.eventlist.set_focus(len(self.eventlist))
+ self.eventlist.set_focus(len(self.eventlist)-1)
# Handlers
def handle_log(self, l):
diff --git a/libmproxy/console/flowlist.py b/libmproxy/console/flowlist.py
index 2b443636..1fdd92b7 100644
--- a/libmproxy/console/flowlist.py
+++ b/libmproxy/console/flowlist.py
@@ -102,12 +102,12 @@ class BodyPile(urwid.Pile):
class ConnectionItem(common.WWrap):
def __init__(self, master, state, flow, focus):
self.master, self.state, self.flow = master, state, flow
- self.focus = focus
+ self.f = focus
w = self.get_text()
common.WWrap.__init__(self, w)
def get_text(self):
- return common.format_flow(self.flow, self.focus)
+ return common.format_flow(self.flow, self.f)
def selectable(self):
return True